Add 'search' server and use it first. Clean up some code.