changed to search query and filter technique
Merge branch 'locu_parser'