HCOLL-121 moved clustering to chronicle map