ported the early test queries to use standard vocab codes