Fixed yet another navigation-search bug, cus awsm
Merge branch 'master' into Kenneth