Window: improved handling of global click tracking