place Search Dictionary at top, redo some logic