Fix for breaking user search