Updated Query.java with customer info, and plan update logic