WW-4365 Solves problem with matching option id to headerKey
Solves minor style problems