#412 Updated redirect logic

Merge request reports