diff --git a/src/templates/open-data.html b/src/templates/open-data.html
index 3dfd928..e24d1e6 100644
--- a/src/templates/open-data.html
+++ b/src/templates/open-data.html
@@ -7,7 +7,7 @@
     <p>{% trans "If you are interested in any other data that is not provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}</p>
 
     <h3>{% trans "Retrieving data via API" %}</h3>
-    <p>{% trans "Colab API works through HTTP/REST and always returning JSON objects." %}</p>
+    <p>{% trans "Colab API works through HTTP/REST, always returning JSON objects." %}</p>
     <p>
       {% trans "The base API URL is" %}:
       {% url 'api_v1_top_level' api_name='v1' as BASE_API_URL %}
@@ -21,30 +21,86 @@
         <ul>
           <li>
             <strong><a href="{{ BASE_API_URL }}user/">user</a></strong>:
-            {% trans "Fields" %}: <i>username, email, institution, role and bio</i>
-            <p><strong>{% trans "The email field is not shown for user's privacy, but you can filter through it" %}</strong></p>
+            {% trans "Fields" %}: <i>username, email, institution, role, first_name, last_name and bio</i>
+            <p><strong>{% trans "The email field is not shown for user's privacy, but you can use it to filter" %}</strong></p>
+            <ul>
+              <li><i>username</i> - {% trans "The user's username" %}</li>
+              <li><i>email</i> - {% trans "The user's email address" %}</li>
+              <li><i>institution</i> - {% trans "What is the user's institution" %}</li>
+              <li><i>role</i> - {% trans "What is the user's role" %}</li>
+              <li><i>first_name</i> - {% trans "The user's first name" %}</li>
+              <li><i>last_name</i> - {% trans "The user's last name" %}</li>
+              <li><i>bio</i> - {% trans "A mini bio of the user" %}</li>
+            </ul>
+            <br />
           </li>
           <li>
             <strong><a href="{{ BASE_API_URL }}emailaddress/">emailaddress</a></strong>:
             {% trans "Fields" %}: <i>user, address and real_name</i>
-            <p>{% trans "The user field is a foreign key for user objects and it can be null" %}</p>
+            <p><strong>{% trans "The address field is not shown for user's privacy, but you can use it to filter" %}</strong></p>
+            <ul>
+              <li><i>user</i> - {% trans "It's a relation to the user described above" %}</li>
+              <li><i>address</i> - {% trans "An email address" %}</li>
+              <li><i>real_name</i> - {% trans "The user's real name" %}</li>
+            </ul>
+            <br />
           </li>
           <li>
             <strong><a href="{{ BASE_API_URL }}message/">message</a></strong>:
             {% trans "Fields" %}: <i>from_address, body, id, received_time and subject</i>
-            <p>{% trans  "The from_address field is a foreign key to emailaddress objects" %}</p>
+            <ul>
+              <li><i>from_address</i> - {% trans "It's a relation with the emailaddress described above" %}</li>
+              <li><i>body</i> - {% trans "The message's body" %}</li>
+              <li><i>subject</i> - {% trans "The message's subject" %}</li>
+              <li><i>id</i> - {% trans "The message's id" %}</li>
+              <li><i>received_time</i> - {% trans "The message's received time" %}</li>
+            </ul>
+            <br />
           </li>
           <li>
             <strong><a href="{{ BASE_API_URL }}revision/">revision</a></strong>:
             {% trans "Fields" %}: <i>author, created, key, message and repository_name</i>
+            <ul>
+              <li><i>author</i> - {% trans "The revision's author username" %}</li>
+              <li><i>created</i> - {% trans "When the revision's were created" %}</li>
+              <li><i>key</i> - {% trans "The revision's key" %}</li>
+              <li><i>message</i> - {% trans "The revision's message" %}</li>
+              <li><i>repository_name</i> - {% trans "The revision's repository name" %}</li>
+            </ul>
+            <br />
           </li>
           <li>
             <strong><a href="{{ BASE_API_URL }}ticket/">ticket</a></strong>:
             {% trans "Fields" %}: <i>author, component, created, description, id, keywords, milestone, modified, modified_by, priority, reporter, severity, status, summary and version</i>
+            <ul>
+              <li><i>author</i> - {% trans "The ticket's author username" %}</li>
+              <li><i>component</i> - {% trans "The ticket's component" %}</li>
+              <li><i>created</i> - {% trans "When the ticket's were created" %}</li>
+              <li><i>description</i> - {% trans "The ticket's description" %}</li>
+              <li><i>id</i> - {% trans "The ticket's id" %}</li>
+              <li><i>keywords</i> - {% trans "The ticket's keywords" %}</li>
+              <li><i>milestone</i> - {% trans "The ticket's milestone" %}</li>
+              <li><i>modified</i> - {% trans "The time of the last modification" %}</li>
+              <li><i>modified_by</i> - {% trans "The username of the last user who modified the ticket" %}</li>
+              <li><i>priority</i> - {% trans "The ticket's priority" %}</li>
+              <li><i>severity</i> - {% trans "The ticket's severity" %}</li>
+              <li><i>status</i> - {% trans "The ticket's status" %}</li>
+              <li><i>summary</i> - {% trans "The ticket's summary" %}</li>
+              <li><i>version</i> - {% trans "The ticket's version" %}</li>
+            </ul>
+            <br />
           </li>
           <li>
             <strong><a href="{{ BASE_API_URL }}wiki/">wiki</a></strong>:
             {% trans "Fields" %}: <i>author, created, modified, modified_by, name and wiki_text</i>
+            <ul>
+              <li><i>author</i> - {% trans "The wiki's author username" %}</li>
+              <li><i>created</i> - {% trans "When the wiki's were created" %}</li>
+              <li><i>modified</i> - {% trans "The time of the last modification" %}</li>
+              <li><i>modified_by</i> - {% trans "The username of the last user who modified the wiki" %}</li>
+              <li><i>name</i> - {% trans "The wiki's name" %}</li>
+              <li><i>wiki_text</i> - {% trans "the wiki's content" %}</li>
+            </ul>
           </li>
         </ul>
       </li>
@@ -75,9 +131,13 @@
         <p><i>...{{ BASE_API_URL }}ticket/?author__endswith={% trans "test" %}</i></p>
         <p><i>...{{ BASE_API_URL }}message/?body__contains={% trans "test" %}</i></p>
         <h4>{% trans "Usage with related models" %}</h4>
+        <p>{% trans "You can use related fields to filter too. So, you can filter by any field of emailaddress using the 'from_address' field of message, which has a relation to emailaddress. You will achieve the relation fields by using double underscore and the field's name. See the example below" %}</p>
+        <p><i>...{{ BASE_API_URL }}message/?from_address__real_name__contains=Name</i></p>
+        <p>{% trans "So, real_name is a field of emailaddress, and you had access to this field by a message field called from_address and using double underscore to say you want to use a field of that relation" %}</p>
+        <p><strong>{% trans "Note: email filters must be exact. Which means that __contains, __startswith, __endswith and others won't work" %}</strong></p>
+        <p>{% trans "Another example of usage with relations to retrieve all messages of a given username or email" %}</p>
+        <p><i>...{{ BASE_API_URL }}message/?from_address__user__username=username</i></p>
         <p><i>...{{ BASE_API_URL }}message/?from_address__user__email=usermailexample@host.com</i></p>
-        <p><i>...{{ BASE_API_URL }}message/?from_address__real_name=Name</i></p>
-        <p><strong>{% trans "Note: email filters must be exact." %} </strong></p>
       </li>
     </ul>
   </div>
--
libgit2 0.21.2