Minor fix to get correct tag_list when no current mappings