Develop

Filter to Servlet changed
+ few small changes