Fix querying for fields