Adding case insensitivity to more keywords