Add support for multiple CONSTRUCT queries in one mapping