Ad-Hoc query version 2 updates