better regexp for grabbing field names