#id 2961 refactor NLA and spell-corrected search results pages