[GEAR] BugFix and enhancements