Better parsing of 'search terms' passed between pages, esp if using '+' modifier [#898]