Ensure legal selector and document option for update option #921