updated default search and re-ordered display