BS-9610: put return type to List when the document is multiple, also
update on refactoring