remove all mention of counters from base query template