PShrestha: Fixed servlets broken by Udeeb