minor changes with queries and tests

including:
 * added a variety of new search options
 * proper html validation in tests added
 * return text in line with community standards