Fixed issue #2: filtering of optional command parameters is too vague