updated default search and re-ordered display

tested on www-test OK, move to stage.