Improvements to track input form structure.