Added additional cheshire queries to hopefully improve the quality of results.