Feature/refactor search phrase rendering