Find users improve implementation with roles filter

merge 2 methods find and find in company in one