issue #1250 added manual mode in NamesAndTypes + tests / fixes issue #1253 as well