Move search to far right. Fixes #654