added security filter, added unit selector