Yep, looks good :-) One last thing - if anyone ever pushes a state without setting __forceReferer (or is already doing it in their code) this will break - can we please wrap this in an if clause checking if `typeof state.data.__forceReferer !== 'undefined'`