Changed template selector to use undo-able load method