Document switching extension as an option (RFE #1427)