Changes for navigational search