This should fix search