Re-factor the field queries to be global