Fixes for new trackhub fieldset