fixes for returning field names