Don't waste time calling query_fields with a null value