bug-1282: (related) fix the redirection-feature for domain search
bug-1282: fix some creepy whitespace things
Merge branch 'bug-1282' into testserver-stable