DSSSM-664 #time 25m Resolving issues related to the duplication of tokens upon switching to the grid layout for results