Changed name filter to be regex based.