Fix select for arc - #523
Refactor toggle for path