diff --git a/Source/BuildGoFish.h b/Source/BuildGoFish.h
index 51a1d8b..f327c3c 100644
--- a/Source/BuildGoFish.h
+++ b/Source/BuildGoFish.h
@@ -1,10 +1,10 @@
 	#DEFINE GOFISH_APP_NAME 'GoFish'
 	#DEFINE GOFISH_APP_FILE  'GoFish.app'
-	#DEFINE GOFISH_VERSION '7.1.35'
-	#DEFINE GOFISH_BUILDDATE 'November 30, 2024'
-	#DEFINE GOFISH_DBUILDDATE Date(2024,11, 30)
+	#DEFINE GOFISH_VERSION '7.1.36'
+	#DEFINE GOFISH_BUILDDATE 'December 05, 2024'
+	#DEFINE GOFISH_DBUILDDATE Date(2024,12, 5)
 	#DEFINE GOFISH_DOWNLOAD_URL 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip'
-	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish - 7.1.35 - November 30, 2024 - 20241130'
+	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish - 7.1.36 - December 05, 2024 - 20241205'
 	#DEFINE THOR_TOOL_NAME	'Thor_Tool_GoFish'
 	#DEFINE VERSON_FILE_URL	'https://github.com/VFPX/GoFish/_GoFishVersionFile.txt'
 	#DEFINE VERSION_LOCAL_FILE 'GoFishVersionFile.txt'
diff --git a/Source/BuildNumber.txt b/Source/BuildNumber.txt
index 597975b..dce6588 100644
--- a/Source/BuildNumber.txt
+++ b/Source/BuildNumber.txt
@@ -1 +1 @@
-35
\ No newline at end of file
+36
\ No newline at end of file
diff --git a/Source/GoFish.APP b/Source/GoFish.APP
index 9a3cf4c..770a321 100644
Binary files a/Source/GoFish.APP and b/Source/GoFish.APP differ
diff --git a/Source/GoFish.pjt b/Source/GoFish.pjt
index 26507f9..5e01ef3 100644
Binary files a/Source/GoFish.pjt and b/Source/GoFish.pjt differ
diff --git a/Source/GoFish.pjx b/Source/GoFish.pjx
index cf4abca..749bc44 100644
Binary files a/Source/GoFish.pjx and b/Source/GoFish.pjx differ
diff --git a/Source/Lib/gofishsearchengine.prg b/Source/Lib/gofishsearchengine.prg
index 1c4d2ad..79434ac 100644
--- a/Source/Lib/gofishsearchengine.prg
+++ b/Source/Lib/gofishsearchengine.prg
@@ -2849,7 +2849,7 @@ Result
 
 				lnReturn = 2
 
-			Case Inlist(m.lcMatchType, MATCHTYPE_CODE, MATCHTYPE_COMMENT) Or;
+			Case Inlist(m.lcMatchType, MATCHTYPE_CODE, MATCHTYPE_COMMENT, '<Cleanup>') Or;
 					(m.toObject.UserField.IsText And !Inlist(m.lcMatchType, MATCHTYPE_FILENAME, MATCHTYPE_TIMESTAMP))
 
 				lnReturn = 1
@@ -5648,6 +5648,15 @@ j
 								lnMaxMatchStart	= Iif(m.llThisField, Len(m.lcCode), m.lnMaxMatchStart)
 							Endif
 	
+							If Not Empty(Cleanup)
+								lcCode			= m.lcCode + CRLF + Replicate('*', 60) + CRLF + CRLF
+								llThisField		= m.lcField = 'CLEANUP'
+								lnMinMatchStart	= Iif(m.llThisField, Len(m.lcCode), m.lnMinMatchStart)
+								lcType			= Iif(m.llThisField, Transform(Len(m.lcCode) + 1) + ' ' + Transform(Len(Cleanup)), m.lcType)
+								lcCode			= m.lcCode + Cleanup + CRLF
+								lnMaxMatchStart	= Iif(m.llThisField, Len(m.lcCode), m.lnMaxMatchStart)
+							Endif
+	
 							If Not Empty(Procedure)
 								lcCode			= m.lcCode + CRLF + Replicate('*', 60) + CRLF + CRLF
 								llThisField		= m.lcField = 'PROCEDURE'
@@ -5656,7 +5665,7 @@ j
 								lcCode			= m.lcCode + Procedure + CRLF
 								lnMaxMatchStart	= Iif(m.llThisField, Len(m.lcCode), m.lnMaxMatchStart)
 							Endif
-	
+		
 						Case m.lcExt = 'DBC'
 							._Name	= Alltrim(ObjectName)
 							._Class	= Alltrim(ObjectType)
diff --git a/Source/Source.zip b/Source/Source.zip
index e90fa83..334d62c 100644
Binary files a/Source/Source.zip and b/Source/Source.zip differ
diff --git a/_GoFishVersionFile.txt b/_GoFishVersionFile.txt
index ca6b1df..4252852 100644
--- a/_GoFishVersionFile.txt
+++ b/_GoFishVersionFile.txt
@@ -207,7 +207,7 @@ EndText
 lcNote = Substr(lcNote, At('--', lcNote))
 lcNote = Alltrim(lcNote, 1, ' ', '-', Chr(13), Chr(10)) 
 
-AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish - 7.1.35 - November 30, 2024 - 20241130')
+AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish - 7.1.36 - December 05, 2024 - 20241205')
 AddProperty(toUpdateInfo, 'SourceFileUrl', 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip')
 AddProperty(toUpdateInfo, 'LinkPrompt', 'GoFish Home Page')
 AddProperty(toUpdateInfo, 'Link', 'https://github.com/VFPX/GoFish')
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
index b0e28dd..fcb20a5 100644
--- a/docs/ChangeLog.md
+++ b/docs/ChangeLog.md
@@ -6,6 +6,11 @@
 
 ---
 
+## Version 7.1.36 - 2024-12-05
+
+Bug fixes:
+- Field "Cleanup" in MNXs was not being searched (#321)
+
 ## Version 7.1.35 - 2024-11-30
 
 Bug fixes: