Make highlight field class less specific