More fixes for GA tracking on AAQ

r?