Fix for public searches