diff --git a/source/java/writer2latex/xhtml/GreenstoneTags.java b/source/java/writer2latex/xhtml/GreenstoneTags.java
index cda1a81..6db976f 100644
--- a/source/java/writer2latex/xhtml/GreenstoneTags.java
+++ b/source/java/writer2latex/xhtml/GreenstoneTags.java
@@ -17,8 +17,13 @@ public class GreenstoneTags {
 
 	private static LinkedList<Integer> headerStack = new LinkedList<Integer>();
 	private static boolean pageSection = false; 
+	private static String tagsType = "none";
 
-	protected static boolean processHeading(Node currentNode, Node hnode, int pageNum) {
+	protected static void processHeading(Node currentNode, Node hnode, int pageNum) {
+		
+		if (tagsType.equals("none") || tagsType.equals("pages")){
+			return;
+		}
 		
 		String sLevel = Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
 		//If this heading contain outline-level
@@ -60,10 +65,13 @@ public class GreenstoneTags {
 			}	
 				
 		}
-		return false;
+		return;
 	}
 	protected static void processPageBreak(Node currentNode, Node hnode, Integer pageNum){
 		
+		if (tagsType.equals("none") || tagsType.equals("headings")){
+			return;
+		}
 		
 		if ( !( currentNode.getNodeType() == Node.ELEMENT_NODE 
 				&& currentNode.getNodeName().equals(XMLString.TEXT_H)
@@ -71,6 +79,7 @@ public class GreenstoneTags {
 				&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
 				)
 				&& !headerStack.isEmpty()
+				|| tagsType.equals("pages")
 				) {
 			if (pageSection) {
 				closeSection(hnode);
@@ -84,11 +93,20 @@ public class GreenstoneTags {
 		}
 	}
 	//Method to open main document tag
-	protected static void StartDocument(Node hnode, String title){
+	protected static void StartDocument(Node hnode, String title, String type){
+		tagsType = type;
+		if (tagsType.equals("none")){
+			return;
+		}
 		openSection(hnode, title);
+		
+		
 	}
 	//Method to close open tags at the end of the document
 	protected static void endDocument(Node hnode){
+		if (tagsType.equals("none")){
+			return;
+		}
 		if (pageSection){
 			closeSection(hnode);
 			pageSection = false;
diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java
index 24f438a..75d2d33 100644
--- a/source/java/writer2latex/xhtml/TextConverter.java
+++ b/source/java/writer2latex/xhtml/TextConverter.java
@@ -103,6 +103,8 @@ public class TextConverter extends ConverterHelper {
 	//Current master page name
 	private String nextMasterPage = null;
 	
+	private String greenstoneTagsType = config.greenstoneTags();
+	
     public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
         super(ofr,config,converter);
         tocCv = new TOCConverter(ofr, config, converter);
@@ -1580,7 +1582,8 @@ public class TextConverter extends ConverterHelper {
 			
 			//Start tagging
 			String sTitle = converter.getTitle();
-			GreenstoneTags.StartDocument(hnode, sTitle);
+			GreenstoneTags.StartDocument(hnode, sTitle,greenstoneTagsType);
+			
 			//Print header
 			addHeader(hnode);