So that's the final version. I had to fix some selection and filtering issues and added some usability. From my point it is ready to merge