Fixed yet another navigation-search bug, cus awsm