super-improved: added support for moveit plugin with proper labeling