Track finding am sv 070414

Seems that some modifs of the 2803 commit where lost in the 0204 commit. This branch is correcting that.