Fix Servo tags to be class/id