Minor improvement on CLI. Added a fix for change table structure, moving
the tags rule, index and trigger to outside of the first.
Merge branch 'cli-improvements' into develop