moved stop for clustering back inside template block