SHL-122: Fix value-less options not at end