core-6290 fix tag search