Navigation of search - fixes