Fix * and # search state - n/N work as expected with these