Improve tag matching in finder.