BISERVER-10435: More tags and updates for enunciate