Prepare for multiword expression searches
Don't save optional additional search terms
Change the icons, and hide a few to clean up the UI