- added more object types to filter
- fixed NPE when location could not be found