diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 2a8d5418..366d12c7 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -513,6 +513,9 @@ If a dictionary is passed then the following options are available:
     Allows you to automatically expire data from a collection by setting the
     time in seconds to expire the a field.
 
+:attr:`name` (Optional)
+    Allows you to specify a name for the index
+
 .. note::
 
     Inheritance adds extra fields indices see: :ref:`document-inheritance`.
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index cfc0cdd4..67c83581 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -214,7 +214,7 @@ class query_counter(object):
         """Get the number of queries."""
         ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}
         count = self.db.system.profile.find(ignore_query).count() - self.counter
-        self.counter += 1
+        self.counter += 1       # Account for the query we just fired
         return count