Fix build error
-clean up imports
-fix default group search