Improve tags support.