Swap regex for filter in component

Instead of regexing out the extra ", " in the names, we can just filter out the empty values first.