ANnother attempt to fix search