Refactoring of IMSIQueryServlet