Cleanup addInterestHost query subquery