added explicit id support to query results and language