select2 wrangling and better number formatting