refactoring: search id fix