Fixing highlighting of properties (#22)