More fixes for GA tracking on AAQ

This should help fix discrepancies in the data Kadir is seeing...

r?
Should probably comment this function a bit. Probably just move the comment from where you extracted the original logic.