Further tidying to merge TMA tracks

(Associated with ticket #589 )
* hide TMA solution after converting to legs/standalone track
* tighter Class checking on merge operation