Improvements to the search text including number formatting, groups, orgs