Further improved text matching to match optional characters within words