BATCHEE-104 BATCHEE-105 few tweaks on the documentation generation