Merge "Fix compare logic in search manager"