Keeping search logic consistent with Hibiscus