Re-add some modifs that where lost in previous commit
Merge pull request #3232 from sviret/TrackFindingAM_SV_070414

Track finding am sv 070414