Fixed location search to support multiple attribute types
* Added unit test with searching by two types