diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Tika.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Tika.java
index cd451cce..c97993cb 100644
--- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Tika.java
+++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Tika.java
@@ -527,10 +527,10 @@ public class Tika
                 {
                     targetMimetype = getValue(arg, true, targetMimetype, TARGET_MIMETYPE);
                 }
-                else if(arg.startsWith(NOT_EXTRACT_BOOKMARKS_TEXT))
+                else if (arg.startsWith(NOT_EXTRACT_BOOKMARKS_TEXT))
                 {
-                        getValue(arg, false, notExtractBookmarksText, NOT_EXTRACT_BOOKMARKS_TEXT);
-                        notExtractBookmarksText = true;
+                    getValue(arg, false, notExtractBookmarksText, NOT_EXTRACT_BOOKMARKS_TEXT);
+                    notExtractBookmarksText = true;
                 }
                 else
                 {
@@ -564,7 +564,7 @@ public class Tika
         includeContents = includeContents == null ? false : includeContents;
         notExtractBookmarksText = notExtractBookmarksText == null ? false : notExtractBookmarksText; 
 
-        transform(transform, includeContents, notExtractBookmarksText,sourceFilename, targetFilename, targetMimetype, targetEncoding);
+        transform(transform, includeContents, notExtractBookmarksText, sourceFilename, targetFilename, targetMimetype, targetEncoding);
     }
 
     private String getValue(String arg, boolean valueExpected, Object value, String optionName)
@@ -801,14 +801,9 @@ public class Tika
             context.set(DocumentSelector.class, documentSelector);
         }
 
-        if (pdfParserConfig != null)
+        if (notExtractBookmarksText.equals(true))
         {
-
-            if (notExtractBookmarksText != null)
-            {
-                pdfParserConfig.setExtractBookmarksText(!notExtractBookmarksText);
-            }
-
+            pdfParserConfig.setExtractBookmarksText(false);
             // pdfParserConfig is set to override default settings
             context.set(PDFParserConfig.class, pdfParserConfig);
         }
diff --git a/alfresco-docker-tika/src/main/resources/templates/transformForm.html b/alfresco-docker-tika/src/main/resources/templates/transformForm.html
index 538e872a..9171491e 100644
--- a/alfresco-docker-tika/src/main/resources/templates/transformForm.html
+++ b/alfresco-docker-tika/src/main/resources/templates/transformForm.html
@@ -26,7 +26,7 @@
                 <tr><td><div style="text-align:right">timeout</div></td><td><input type="text" name="timeout" value="" /></td></tr>
                 <tr><td><div style="text-align:right">testDelay</div></td><td><input type="text" name="testDelay" value="" /></td></tr>
 				<tr><td><div style="text-align:right">notExtractBookmarksText</div></td><td><input type="checkbox" name="notExtractBookmarksText" value="true" /></td></tr>
-                <tr><td></td><td><input type="submit" value="Transform" /></td></tr>
+				<tr><td></td><td><input type="submit" value="Transform" /></td></tr>
             </table>
         </form>
     </div>
diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java
index 5349ee89..dd711d73 100644
--- a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java
+++ b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java
@@ -345,7 +345,6 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
     @Test
     public void pdfToTxtExtractBookmarksTest() throws Exception
     {
-
         super.mockTransformCommand(controller, PDF, TXT, MIMETYPE_PDF, true);
         mockMvc.perform(mockMvcRequest("/transform", sourceFile, "targetExtension", targetExtension).param("notExtractBookmarksText", "true"))
                 .andExpect(status().is(200))