Added a location filter