adding number type, disallowing keywords to be part of substrings