TESTWS-420: Improve Location Search to allow searching by tag