added withinRadius filter
wip
fix tabs
fixed merge conflict