Added Analytics Tracking for Queries