Fixed not taking in account RoleHierarchy in expressions