a little bit bugfixing and play around with JavaScript UpdateHandling