MoKeeHelper: improve options

Change-Id: I879638ee4993c8355b89266d594a0b1c12541c1a