updated: shape layer behaviour - moved polygon selection code upstead