Adjustments to default case for short codes