Update some queries. TODO inserting cuboids