Refactor: clean id on buttons in search