Mantis:Codev-11ae70-Reduce the command selection b/en

Reduce the command selection by setting some filters