Cleans up and adds better filter handling for string mask