Fix premature refactoring
Merge branch 'display_empty_list_for_nonexisting_tags'