Add Case-insensitivity on keywords