Fixed Sorting issue since moving to Vaadin 7 and fixed also scrollwheel zooming (again)