changed field names in query