Adding better search and edit terms