Location filtering working
after merge