More fixes for GA tracking on AAQ

This should help fix discrepancies in the data Kadir is seeing...

r?
gah