Extra unit test to allow multiple query selectors
Refactored where searches to use a library function
Unit test to allow searches on simple arrays