WP-4587 change the index from value to tid