Further tidying to merge TMA tracks

* hide TMA solution after converting to legs/standalone track
* tighter Class checking on merge operation