4 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/drivers/cswordbiblemoduleinfo.cpp b/src/backend/drivers/cswordbiblemoduleinfo.cpp
index 921157b..adf88b0 100644
--- a/src/backend/drivers/cswordbiblemoduleinfo.cpp
+++ b/src/backend/drivers/cswordbiblemoduleinfo.cpp
@@ -167,9 +167,6 @@ unsigned int CSwordBibleModuleInfo::verseCount( const QString& book, const unsig
 
 unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book) {
 	unsigned int bookNumber = 0;
-	bool found = false;
-	int min = 0;
-	int max = 1;
 
 	//find out if we have ot and nt, only ot or only nt
 	initBounds();
@@ -182,6 +179,9 @@ unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book) {
 
 	bookNumber = ((key->Testament() > 1) ? key->BMAX[0] : 0) + key->Book();
 #else
+	bool found = false;
+	int min = 0;
+	int max = 1;
 
 	if ((m_hasOT>0 && m_hasNT>0) || (m_hasOT == -1 && m_hasNT == -1)) {
 		min = 0;
diff --git a/src/backend/drivers/cswordlexiconmoduleinfo.cpp b/src/backend/drivers/cswordlexiconmoduleinfo.cpp
index a8b81e4..c84cd07 100644
--- a/src/backend/drivers/cswordlexiconmoduleinfo.cpp
+++ b/src/backend/drivers/cswordlexiconmoduleinfo.cpp
@@ -63,6 +63,11 @@ QStringList* CSwordLexiconModuleInfo::entries() {
 			return m_entryList;
 		}
 
+		if ( name() == QString("EReo_en")) {
+			qWarning("Module EReo_en is buggy and will not be loaded.");
+			return m_entryList;
+		}
+
 		QString dir(util::filesystem::DirectoryUtil::getUserCacheDir().absolutePath());
 		QFile f1(
 			QString(dir)
diff --git a/src/backend/filters/bt_osishtml.cpp b/src/backend/filters/bt_osishtml.cpp
index b9c9746..bbcf8e5 100644
--- a/src/backend/filters/bt_osishtml.cpp
+++ b/src/backend/filters/bt_osishtml.cpp
@@ -262,7 +262,7 @@ bool Filters::BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, swo
 					buf.append("<span class=\"crossreference\">");
 #ifdef SWORD_SIMPLERENDER
 					sword::SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-					sword::SWBuf footnoteBody = myModule->getEntryAttributes()["Footnote"][footnoteNumber]["body"];
+					sword::SWBuf footnoteBody = myUserData->entryAttributes["Footnote"][footnoteNumber]["body"];
 					buf += myModule->RenderText(footnoteBody);
 #endif
 				}
diff --git a/src/backend/filters/bt_osishtml.h b/src/backend/filters/bt_osishtml.h
index 7ae5e6d..175ee4b 100644
--- a/src/backend/filters/bt_osishtml.h
+++ b/src/backend/filters/bt_osishtml.h
@@ -12,6 +12,7 @@
 
 //Sword includes
 #include <swbuf.h>
+#include <swmodule.h>
 #include <osishtmlhref.h>
 
 namespace Filters {
@@ -31,10 +32,12 @@ BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::OSI
 				noteType = Unknown;
 				swordFootnote = 1;
 				inCrossrefNote = false;
+				entryAttributes = module->getEntryAttributes();
 			}
 
 			unsigned short int swordFootnote;
 			bool inCrossrefNote;
+			sword::AttributeTypeList entryAttributes;
 
 			enum NoteType {
 				Unknown,