Fixed 2 bugs
- Highlight wasn't working properly
- The classification wasn't being reapplied when the polygon selection was used.