updated by adding in location filter, + bug fixes