Tweak to handle single_select command when there's a full selection