removed 'and' operator from search string
Merge branch 'hotfix' into dev
removed report role-based filtering
Merge branch 'hotfix' into dev