IAPage - clean up and fix bugs in saving example queries