LPS-34846 Fixed groupId and type extraction logic when article is found
LPS-34846 Source formatting