diff --git a/apps/document_comments/views.py b/apps/document_comments/views.py
index 4a87435fa3..005ee109cd 100644
--- a/apps/document_comments/views.py
+++ b/apps/document_comments/views.py
@@ -43,6 +43,7 @@ def comment_delete(request, comment_id=None, comment_id_list=None):
         for comment in comments:
             try:
                 comment.delete()
+                comment.content_object.mark_indexable()
                 messages.success(request, _(u'Comment "%s" deleted successfully.') % comment)
             except Exception, e:
                 messages.error(request, _(u'Error deleting comment "%(comment)s": %(error)s') % {
@@ -95,7 +96,8 @@ def comment_add(request, document_id):
             comment.object_pk = document.pk
             comment.site = Site.objects.get_current()
             comment.save()
-
+            document.mark_indexable()
+            
             messages.success(request, _(u'Comment added successfully.'))
             return HttpResponseRedirect(next)
     else:
@@ -110,9 +112,9 @@ def comment_add(request, document_id):
 
 
 def comments_for_document(request, document_id):
-    '''
+    """
     Show a list of all the comments related to the passed object
-    '''
+    """
     document = get_object_or_404(Document, pk=document_id)
 
     try:
diff --git a/apps/documents/models.py b/apps/documents/models.py
index 5c1c69e732..784c97d2f8 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -103,7 +103,7 @@ class Document(models.Model):
             self.uuid = UUID_FUNCTION()
             self.date_added = datetime.datetime.now()
         super(Document, self).save(*args, **kwargs)
-        self.mark_dirty()
+        self.mark_indexable()
 
     def get_cached_image_name(self, page, version):
         document_version = DocumentVersion.objects.get(pk=version)
diff --git a/apps/metadata/views.py b/apps/metadata/views.py
index b380b81025..b5b834a081 100644
--- a/apps/metadata/views.py
+++ b/apps/metadata/views.py
@@ -92,6 +92,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
                         messages.error(request, _(u'Error editing metadata for document %(document)s; %(error)s.') % {
                         'document': document, 'error': error})
                 else:
+                    document.mark_indexable()
                     messages.success(request, _(u'Metadata for document %s edited successfully.') % document)
 
             return HttpResponseRedirect(next)
@@ -149,6 +150,8 @@ def metadata_add(request, document_id=None, document_id_list=None):
                 else:
                     messages.warning(request, _(u'Metadata type: %(metadata_type)s already present in document %(document)s.') % {
                         'metadata_type': metadata_type, 'document': document})
+                        
+                document.mark_indexable()
 
             if len(documents) == 1:
                 return HttpResponseRedirect(u'%s?%s' % (
@@ -236,6 +239,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
                         try:
                             document_metadata = DocumentMetadata.objects.get(document=document, metadata_type=metadata_type)
                             document_metadata.delete()
+                            document.mark_indexable()
                             messages.success(request, _(u'Successfully remove metadata type: %(metadata_type)s from document: %(document)s.') % {
                                 'metadata_type': metadata_type, 'document': document})
                         except:
diff --git a/apps/tags/views.py b/apps/tags/views.py
index a153506e02..1cf79abdf8 100644
--- a/apps/tags/views.py
+++ b/apps/tags/views.py
@@ -78,7 +78,7 @@ def tag_attach(request, document_id):
                 return HttpResponseRedirect(next)
 
             document.tags.add(tag)
-
+            document.mark_indexable()
             messages.success(request, _(u'Tag "%s" attached successfully.') % tag)
             return HttpResponseRedirect(next)
     else:
@@ -141,6 +141,8 @@ def tag_delete(request, tag_id=None, tag_id_list=None):
     if request.method == 'POST':
         for tag in tags:
             try:
+                for document in Document.objects.filter(tags__in=[tag]):
+                    document.mark_indexable() 
                 tag.delete()
                 messages.success(request, _(u'Tag "%s" deleted successfully.') % tag)
             except Exception, e:
@@ -188,6 +190,8 @@ def tag_edit(request, tag_id):
         if form.is_valid():
             tag.name = form.cleaned_data['name']
             tag.save()
+            for document in Document.objects.filter(tags__in=[tag]):
+                document.mark_indexable() 
             tag_properties = tag.tagproperties_set.get()
             tag_properties.color = form.cleaned_data['color']
             tag_properties.save()
@@ -264,6 +268,7 @@ def tag_remove(request, document_id, tag_id=None, tag_id_list=None):
         for tag in tags:
             try:
                 document.tags.remove(tag)
+                document.mark_indexable()
                 messages.success(request, _(u'Tag "%s" removed successfully.') % tag)
             except Exception, e:
                 messages.error(request, _(u'Error deleting tag "%(tag)s": %(error)s') % {