Handles query fields for instances now