Added proper sonar handling
fixed bug with wrong place in hierarchy choose