Correct label for JPG surrogate
Move some of the specific encoder class lifting up a level