Resolved an issue with navigating the site incorrectly by revamping the
system in which it decides.