diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 93282fb6d..4ab8df042 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,5 +1,6 @@
 6.2.3
  - Changed to new POD format.
+ - Fixed GUID related bugs in search indexer and passive profiling.
 
 
 6.2.2
diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm
index abf7e4a21..ed1c3501c 100644
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@@ -112,7 +112,7 @@ sub summarizeAOI {
 			d.value 
 		from metaData_values d , metaData_properties f 
 		where f.fieldId = d.fieldId 
-			and d.wobjectId = ".$data->{wobjectId};
+			and d.wobjectId = ".quote($data->{wobjectId});
 
         my $sth = WebGUI::SQL->read($sql);
         while (my $field = $sth->hashRef) {
diff --git a/sbin/Hourly/IndexedSearch_buildIndex.pm b/sbin/Hourly/IndexedSearch_buildIndex.pm
index c91648456..391d8be26 100644
--- a/sbin/Hourly/IndexedSearch_buildIndex.pm
+++ b/sbin/Hourly/IndexedSearch_buildIndex.pm
@@ -106,8 +106,8 @@ sub getIndexerParams {
 			fieldsToIndex => ["synopsis" , "title"],
 			contentType => 'page',
 			url => '$data{urlizedTitle}',
-			headerShortcut => 'select title from page where pageId = $data{pageId}',
-			bodyShortcut => 'select synopsis from page where pageId = $data{pageId}', 
+			headerShortcut => 'select title from page where pageId = \'$data{pageId}\'',
+			bodyShortcut => 'select synopsis from page where pageId = \'$data{pageId}\'', 
 		},
 	wobject =>	{
 			sql => "select wobject.namespace as namespace, 
@@ -130,8 +130,8 @@ sub getIndexerParams {
 			fieldsToIndex => ["title", "description"],
 			contentType => 'wobject',
 			url => '$data{urlizedTitle}."#".$data{wid}',
-			headerShortcut => 'select title from wobject where wobjectId = $data{wid}',
-			bodyShortcut => 'select description from wobject where wobjectId = $data{wid}',
+			headerShortcut => 'select title from wobject where wobjectId = \'$data{wid}\'',
+			bodyShortcut => 'select description from wobject where wobjectId = \'$data{wid}\'',
 		},
 	wobjectDiscussion => {
 			sql => "select  forumPost.forumPostId,
@@ -159,8 +159,8 @@ sub getIndexerParams {
 			fieldsToIndex => ["username", "subject", "message"],
 			contentType => 'discussion',
 			url => 'WebGUI::URL::append($data{urlizedTitle},"func=view&wid=$data{wid}&forumId=$data{forumId}&forumOp=viewThread&forumPostId=$data{forumPostId}")',
-			headerShortcut => 'select subject from forumPost where forumPostId = $data{forumPostId}',
-			bodyShortcut => 'select message from forumPost where forumPostId = $data{forumPostId}',
+			headerShortcut => 'select subject from forumPost where forumPostId = \'$data{forumPostId}\'',
+			bodyShortcut => 'select message from forumPost where forumPostId = \'$data{forumPostId}\'',
 	},
 	userProfileData => {
 			sql => "select distinct(userProfileData.userId),
@@ -184,11 +184,11 @@ sub getIndexerParams {
 						and userProfileField.visible=1
 						and userProfileData.fieldName = userProfileField.fieldName
 						and fieldData <> ''
-						and userProfileData.userId = $data{userId}
+						and userProfileData.userId = \'$data{userId}\'
 					   / ],
 			url => '"?op=viewProfile&uid=$data{userId}"',
 			contentType => 'profile',
-			headerShortcut => 'select username from users where userId = $data{userId}',
+			headerShortcut => 'select username from users where userId = \'$data{userId}\'',
 			#bodyShortcut => q/select concat(fieldName,': ',fieldData) from userProfileData where userId = $data{userId}/
 			bodyShortcut => '$textToIndex',
 		}