progress refactoring and fixed #23 (wakelock during search)