Updated servlet to be fully compatable with Tiles