RTGOV-566 Further work to split out the header values into separate prop...

...erties