fix omni mapping & add ctrlptag mapping