diff --git a/include/eepp/version.hpp b/include/eepp/version.hpp
index 1ebc43347..360863193 100644
--- a/include/eepp/version.hpp
+++ b/include/eepp/version.hpp
@@ -5,9 +5,9 @@
 #include <string>
 
 #define EEPP_MAJOR_VERSION 2
-#define EEPP_MINOR_VERSION 6
-#define EEPP_PATCH_LEVEL 1
-#define EEPP_CODENAME "Anathapindika"
+#define EEPP_MINOR_VERSION 7
+#define EEPP_PATCH_LEVEL 0
+#define EEPP_CODENAME "Kāla"
 
 /** The compiled version of the library */
 #define EEPP_VERSION( x )                  \
diff --git a/src/eepp/system/lua-str.cpp b/src/eepp/system/lua-str.cpp
index 92bdd1de5..57015959b 100644
--- a/src/eepp/system/lua-str.cpp
+++ b/src/eepp/system/lua-str.cpp
@@ -239,8 +239,10 @@ static const char* min_expand( MatchState* ms, const char* s, const char* p, con
 static const char* start_capture( MatchState* ms, const char* s, const char* p, int what ) {
 	const char* res;
 	int level = ms->level;
-	if ( level >= LUA_MAXCAPTURES )
+	if ( level >= LUA_MAXCAPTURES ) {
 		throw_error( "too many captures" );
+		return NULL;
+	}
 	ms->capture[level].init = s;
 	ms->capture[level].len = what;
 	ms->level = level + 1;
@@ -262,7 +264,7 @@ static const char* match_capture( MatchState* ms, const char* s, int l ) {
 	size_t len;
 	l = check_capture( ms, l );
 	len = ms->capture[l].len;
-	if ( ( size_t )( ms->src_end - s ) >= len && memcmp( ms->capture[l].init, s, len ) == 0 )
+	if ( (size_t)( ms->src_end - s ) >= len && memcmp( ms->capture[l].init, s, len ) == 0 )
 		return s + len;
 	else
 		return NULL;
diff --git a/src/tools/ecode/applayout.xml.hpp b/src/tools/ecode/applayout.xml.hpp
index 41f61eaac..dcdb1f717 100644
--- a/src/tools/ecode/applayout.xml.hpp
+++ b/src/tools/ecode/applayout.xml.hpp
@@ -68,10 +68,12 @@ StatusBar > #doc_info {
 #search_replace.error {
 	border-color: #ff4040;
 }
-TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(2) {
+TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(2),
+TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(3) {
 	color: var(--font-hint);
 }
-TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(2) {
+TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(2),
+TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(3) {
 	color: var(--font);
 }
 .search_tree treeview::cell {
diff --git a/src/tools/ecode/universallocator.cpp b/src/tools/ecode/universallocator.cpp
index da618b27b..bd07a528b 100644
--- a/src/tools/ecode/universallocator.cpp
+++ b/src/tools/ecode/universallocator.cpp
@@ -414,7 +414,12 @@ void UniversalLocator::updateLocateBarSync() {
 	mLocateTable->setPixelsSize( width,
 								 mLocateTable->getRowHeight() * LOCATEBAR_MAX_VISIBLE_ITEMS );
 	width -= mLocateTable->getVerticalScrollBar()->getPixelsSize().getWidth();
-	if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 2 ) {
+	if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 3 ) {
+		mLocateTable->setColumnsVisible( { 0, 1, 2 } );
+		mLocateTable->setColumnWidth( 0, eefloor( width * 0.5 ) );
+		mLocateTable->setColumnWidth( 1, eefloor( width * 0.25 ) );
+		mLocateTable->setColumnWidth( 2, eefloor( width * 0.25 ) );
+	} else if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 2 ) {
 		mLocateTable->setColumnsVisible( { 0, 1 } );
 		mLocateTable->setColumnWidth( 0, eeceil( width * 0.5 ) );
 		mLocateTable->setColumnWidth( 1, width - mLocateTable->getColumnWidth( 0 ) );
diff --git a/src/tools/ecode/version.hpp b/src/tools/ecode/version.hpp
index 841ee6882..7c28b3635 100644
--- a/src/tools/ecode/version.hpp
+++ b/src/tools/ecode/version.hpp
@@ -7,9 +7,9 @@
 using namespace EE;
 
 #define ECODE_MAJOR_VERSION 0
-#define ECODE_MINOR_VERSION 4
-#define ECODE_PATCH_LEVEL 9
-#define ECODE_CODENAME "Vajra"
+#define ECODE_MINOR_VERSION 5
+#define ECODE_PATCH_LEVEL 0
+#define ECODE_CODENAME "Ākāśa"
 
 /** The compiled version of the library */
 #define ECODE_VERSION( x )                  \