bugfixes for doctags refactoring