Support tags on admin based on new structure