Fix premature refactoring
Merge branch 'display_empty_list_for_nonexisting_tags'
Merge branch 'master' into skin_rearrangement
Refactoring needs to appear on this branch