Added "filter by location" feature
Updated version #
Merge branch 'wip-1'