#736 Fixed insertion of folder as custom option; removed folder selection;