Filter to Servlet changed

Filter to Servlet changed
+ few small changes