Ad-hoc query enhancements