Changed shortstring underscore thingy to use regex to filter