New Feature on CM query editor