Extended accept header fix

Fixes #829

The extra data is removed completely by RequestHeaders - we may want to revisit this at some point and also store the additional data if anyone needs it.