better handling of controlled lists