Improve Innerquery support