Various

Code cleanup + Option to move search result