Improved intropsection/bootstapping queries