fix search navigation - make it generic