BS-7159
Fix grammar, add UTF8 characters for ID terminal