AI-434 : narrative indicators fixes