reworking front end queries for NewTest