HG-91 fixed bugs in nav and also started adding search