diff --git a/application/controllers/monpas/Pdfmaker.php b/application/controllers/monpas/Pdfmaker.php
index efddbb2..3c3bf10 100644
--- a/application/controllers/monpas/Pdfmaker.php
+++ b/application/controllers/monpas/Pdfmaker.php
@@ -23,7 +23,18 @@ class  Pdfmaker extends MY_Controller{
         $inputstring	= $this->input->post('data');
         $input			= json_decode($inputstring);
         $inhoud         = $input->pagina;
-        $titel          = $input->titel;
+        $schooljaar     = $input->titel;
+        $orgsoort       = $input->orgsoort;
+        switch($orgsoort){
+            case 1 : $profiel = 'SWOP';
+            break;
+            case 2 : $profiel = 'ROP';
+            break;
+            case 3 : $profiel = 'BOP';
+            break;
+            default : $profiel = 'SOP';
+        }
+        $soptitel = 'Compact '.$profiel. ' ' . $schooljaar;
         $schoolid       = $input->schoolid;
         $schooljaarnummer   = $input->schooljaarnr;
         $organisatie        = $this->Organisaties_model->get(['id' => $schoolid],false, true);
@@ -31,18 +42,18 @@ class  Pdfmaker extends MY_Controller{
         $html = $this->load->view('monpas/compactsop/sopcompact.php', $data, TRUE);
         $date = date('dmY');
         $zoek = [" ", "'", "/"];
+        $bestandstitel = str_replace($zoek, "", $soptitel);
         $schoolid = str_replace($zoek, "",$schoolid);
-        $schoolnaam = str_replace($zoek, "",$organisatie->naamkort);
-//        $schoolnaam = $organisatie->naamkort;
-        $titel = str_replace($zoek, "",$titel);
+        $sopschoolnaam = str_replace("'", "'", $organisatie->naamkort);
+        $bestandsschoolnaam = str_replace($zoek, "",$sopschoolnaam);;
 
         $frameworklogo= $this->config->item('vendor_url').'/images/logos/frameworklogo.png';
         $logonaam = $this->Schooldetails_model->get(["organisatie_id" =>$schoolid],'logo', true);
         if (! $logonaam) $logonaam="monpaslogo.png";
         $schoollogo = $this->config->item('vendor_url').'/images/logos/'.$logonaam;
        
-        $headerdata = ['titel'          =>$titel, 
-                        'schoolnaam'    =>$schoolnaam ? $schoolnaam : '',
+        $headerdata = ['titel'          =>$soptitel,
+                        'schoolnaam'    =>$sopschoolnaam ? $sopschoolnaam : '',
                         'logoframework' =>$frameworklogo,
                         'logoschool'    =>$schoollogo];
         $footerdata = "";
@@ -50,7 +61,7 @@ class  Pdfmaker extends MY_Controller{
         $footer     =  $this->load->view ("monpas/compactsop/compactfooter", $footerdata, TRUE);
         $filenaam     = $this->compactsoppath.'sop.pdf';
 
-        $bestandsnaam = "compactsop".$schoolnaam.$schoolid.$titel.'-'.$date.'.pdf';
+        $bestandsnaam = "compactsop".$bestandsschoolnaam.$schoolid.$bestandstitel.'-'.$date.'.pdf';
         $downloadnaam = $this->compactsoppath.$bestandsnaam;
       
          // TODO check if exists
diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php
index dd0e6f3..c0d36ed 100644
--- a/application/libraries/monpas/compactsop/Compacteonderdelen.php
+++ b/application/libraries/monpas/compactsop/Compacteonderdelen.php
@@ -106,6 +106,7 @@ class Compacteonderdelen
             'naamkort'      => $this->organisatie->naamkort,
             'details'        => $this->details,
             'orgsoort'      => $this->orgsoort,
+            'orgsoortnr'    => $this->organisatie->soort,
             'schooljaar'    => $this->schooljaar->naam,
             'schooljaarnr'  => $this->schooljaarnr,
             'datum'         => date("d-m-Y"),
diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php
index 4497380..cf78914 100644
--- a/application/libraries/monpas/compactsop/Compacteversies.php
+++ b/application/libraries/monpas/compactsop/Compacteversies.php
@@ -120,7 +120,7 @@ class Compacteversies
     }
 
     private function setDivSchooltypes(){
-        if(!isset($this->onderdeel->modulenr)) return;
+        if(!$this->onderdeel->modulenr) return;
         switch($this->onderdeel->modulenr){
             case 1: $this->onderdeel->schooltype = 'Alle';
             break;
@@ -151,6 +151,7 @@ class Compacteversies
     }
 
     private function setDiversiteit(){
+        if(!$this->onderdeel->modulenr) return;
         if($this->onderdeel->nummer != 1 && $this->onderdeel->nummer != 10) return;
         $module = $this->onderdeel->modulenr;
         if(isset($this->swvID) && $this->swvID == 150 && $this->schooljaar->schooljaarnr > 8 && $this->onderdeel->modulenr != 270) $module = 660;
diff --git a/application/libraries/monpas/compactsop/test.phtml b/application/libraries/monpas/compactsop/test.phtml
index c931345..5a5c57c 100644
--- a/application/libraries/monpas/compactsop/test.phtml
+++ b/application/libraries/monpas/compactsop/test.phtml
@@ -10,6 +10,10 @@
     <input id="schooljaarnummer1"
            value="10 "
            type ="hidden" />
+    <input id="orgsoort1<?=$paginanummer?>"
+           value="<?=$schoolgegevens['data']['orgsoortnr'];?> "
+           type ="hidden" />
+
 
     <div class="row" style='padding-top:1px;'>
         <div style="margin-top:-20px"></div>
diff --git a/application/views/monpas/compactsop/blokjescompact.php b/application/views/monpas/compactsop/blokjescompact.php
index e12d4f7..58c76aa 100644
--- a/application/views/monpas/compactsop/blokjescompact.php
+++ b/application/views/monpas/compactsop/blokjescompact.php
@@ -10,6 +10,10 @@
     <input id="schooljaarnummer<?=$paginanummer?>"
            value="<?=$schoolgegevens['data']['schooljaarnr'];?> "
            type ="hidden" />
+    <input id="orgsoort<?=$paginanummer?>"
+           value="<?=$schoolgegevens['data']['orgsoortnr'];?> "
+           type ="hidden" />
+
 
     <div class="row" style='padding-top:1px;'>
        <?php if ($paginanummer == 1) { ?>
diff --git a/application/views/monpas/compactsop/compactheader.php b/application/views/monpas/compactsop/compactheader.php
index 5444c6e..55d3e21 100644
--- a/application/views/monpas/compactsop/compactheader.php
+++ b/application/views/monpas/compactsop/compactheader.php
@@ -13,7 +13,7 @@
                 padding-top:15px;
                 margin-top:0px;
                 margin-bottom:0px">
-                        <?php echo 'Compact Sop '. $titel ?>
+                        <?php echo $titel ?>
     </h3>
    
     <h3 style="font-weight:bold;
diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php
index 5ee19ae..a428ee4 100644
--- a/application/views/monpas/compactsop/paginacompact.php
+++ b/application/views/monpas/compactsop/paginacompact.php
@@ -732,9 +732,11 @@
     function fSendtoServer(){
         var wholepage  = document.getElementById("compactSopPdf").outerHTML;
         var titelvar = document.getElementById('schooljaar1').value
+        var orgsoort = document.getElementById('orgsoort1').value
         var submitData={
             pagina : wholepage,
             titel : titelvar,
+            orgsoort: orgsoort,
             schooljaarnr: document.getElementById('schooljaarnummer1').value,
             schoolid : document.getElementById('schoolid1').value
         }