added filtering of locations