Story 45754019: refactoring search functionality and changing display name