-- enable search, fixed conflict in filter by role
Merge pull request #77 from jttorate/master

-- enable search, fixed conflict in filter by role