PC9 Fix for tag extraction