Changes on Molecule.Search with navigation