improve tags selection