Fixed entity loading in all servlets