Branch 0.4 select target section

Tested and verified and updated on branch 0.4,