changing the logic to show the “and X more”, let’s see if it works better