Fix device based redirects

Fix issue where device based redirects would not always take you to the proper redirect site.

Note: jira wont allow me to create a jira for this right now for some reason. Hence why there is not jira id attached.