Better determination of substring match for type-select.
Better determination of substring match for type-select.

JackieXie168/skim,JackieXie168/skim,JackieXie168/skim,JackieXie168/skim,JackieXie168/skim