diff --git a/src/adapters/data_models/library_model/library_proxy_model.cpp b/src/adapters/data_models/library_model/library_proxy_model.cpp
index d6154268c..d9cd4471d 100644
--- a/src/adapters/data_models/library_model/library_proxy_model.cpp
+++ b/src/adapters/data_models/library_model/library_proxy_model.cpp
@@ -97,7 +97,7 @@ bool LibraryProxyModel::filterAcceptsRow(int source_row,
     auto index = sourceModel()->index(source_row, 0, source_parent);
 
     if(!getIsFiltering())
-        return filterAcceptsFolder(index);
+        return filterAcceptsFolder(index) && filterAcceptsTags(index);
 
     return filterAcceptsTags(index) && filterAcceptsAuthors(index) &&
            filterAcceptsFormat(index) && filterAcceptsStatus(index) &&
diff --git a/src/presentation/homePage/MBookDetailsPopup.qml b/src/presentation/homePage/MBookDetailsPopup.qml
index d0dd02bda..c883d3bad 100644
--- a/src/presentation/homePage/MBookDetailsPopup.qml
+++ b/src/presentation/homePage/MBookDetailsPopup.qml
@@ -230,7 +230,6 @@ Popup {
                             spacing: 13
 
                             component InputBox: MLabeledInputBox {
-                                id: titleField
                                 Layout.fillWidth: true
                                 boxHeight: 34
                                 headerFontWeight: Font.Bold
@@ -246,12 +245,14 @@ Popup {
                             }
 
                             InputBox {
+                                id: titleField
                                 headerText: qsTr("Title")
                                 text: Globals.selectedBook
                                       !== null ? Globals.selectedBook.title : ""
                             }
 
                             InputBox {
+                                id: authorsField
                                 headerText: qsTr("Authors")
                                 text: Globals.selectedBook
                                       !== null ? Globals.selectedBook.authors : ""
@@ -281,12 +282,14 @@ Popup {
                             }
 
                             InputBox {
+                                id: documentCreatorField
                                 headerText: qsTr("Document creator")
                                 text: Globals.selectedBook
                                       !== null ? Globals.selectedBook.creator : ""
                             }
 
                             InputBox {
+                                id: creationDateField
                                 headerText: qsTr("Creation date")
                                 text: Globals.selectedBook
                                       !== null ? Globals.selectedBook.creationDate : ""
@@ -294,6 +297,7 @@ Popup {
                             }
 
                             InputBox {
+                                id: formatField
                                 headerText: qsTr("Format")
                                 text: Globals.selectedBook !== null
                                       && Globals.selectedBook.format !== "" ? Globals.selectedBook.format : internal.placeholderText