removed hacks to redirect to servlet