SPP-100 #time 10m Ensuring that further non-alphanumeric characters are parsed for FN terminating tokens