Add angle brackets to keyword matching