Fix subtag search when there is no session