Added filtering and permission behaviour
Removed unnecessary imports
Merge pull request #2041 from lwyszomi/82630-FilteringAndPermission

Added filtering and permission behaviour