Improve tag category selection