WIP - plugin refact
Polygon_selector fix