Test and fix 2i queries