removed two conditions when retrieving units visible to admin