Adding support for tracking even when redirect occurs