Improvements on chooser. Issue RDFORMS-16