Added searching by ONID, moved strings to I18n, and got rid of the helper.