incorporate querying and synonyms??? test?