Add selection wrapping to commands
Add more edit view attribute highlights
Fix reference to wrong exception name