Merge pull request #2609 from michitux/fix/search_acl