fixed navigation and added searching state information