[PR] Allow to filter by location