Fixes bug 1151328

Also makes positional parameters of Show/Update/Delete commands upper.

Change-Id: Ifc6b76954ad987379f765f346167bb73556034f1