In stable 14 and beyond we pretend to use the same query_id in both extensions. Adding AQO TAP-tests on this feature we found out next issues: 1. AQO stores not-parameterized query texts. 2. In the case of EXPLAIN ANALYZE, query_id in the extensions are different 3. Also, we should check the case with queries in stored procedures