Better search results language in add workflow. Closes #818. Closes #805