Change option processing to allow initial page