added filter and distance restriction (after current filter, only one place remains...)