diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/Helper/FrontendApi.php b/src/Netzmacht/Contao/Leaflet/Frontend/Helper/FrontendApi.php
index c7afa1a..b6919a7 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/Helper/FrontendApi.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/Helper/FrontendApi.php
@@ -21,8 +21,10 @@ class FrontendApi extends \Frontend
     /**
      * {@inheritdoc}
      */
+    // @codingStandardsIgnoreStart
     public function replaceInsertTags($strBuffer, $blnCache = true)
     {
         return parent::replaceInsertTags($strBuffer, $blnCache);
     }
+    // @codingStandardsIgnoreEnd
 }
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php b/src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php
index ccd682d..11a855b 100644
--- a/src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/ValueFilter.php
@@ -43,7 +43,7 @@ class ValueFilter
      * The idea behind this extra method is that we just have to change one place if anything else than the
      * insert tags has to be replaced.
      *
-     * @param string $value The given value
+     * @param string $value The given value.
      *
      * @return string
      */
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
index a8c6c56..fd4db71 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/AbstractMapper.php
@@ -41,7 +41,7 @@ abstract class AbstractMapper implements Mapper
     protected static $definitionClass = null;
 
     /**
-     * Options builder
+     * Options builder.
      *
      * @var OptionsBuilder
      */
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php
index 30c2750..08785dc 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/DefinitionMapper.php
@@ -60,7 +60,7 @@ class DefinitionMapper
     /**
      * Add a mapper.
      *
-     * @param Mapper $mapper  The mapper.
+     * @param Mapper $mapper   The mapper.
      * @param int    $priority The priority. The higher priorities get called first.
      *
      * @return $this
@@ -165,6 +165,7 @@ class DefinitionMapper
      * @param mixed $model The data model.
      *
      * @return Mapper
+     * @throws \RuntimeException If the mapper could not be found.
      */
     private function getMapper($model)
     {
@@ -178,7 +179,7 @@ class DefinitionMapper
 
         throw new \RuntimeException(
             sprintf(
-                'Could not build model "". No matching mappers found.',
+                'Could not build model "%s". No matching mappers found.',
                 $this->hash($model)
             )
         );
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
index f9b03de..4e5c034 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/MarkersLayerMapper.php
@@ -63,7 +63,7 @@ class MarkersLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
             if ($model->pointToLayer || $model->affectBounds) {
                 $layer = new GeoJson($this->getElementId($model, $elementId));
 
-                if ($model->pointToLayer ) {
+                if ($model->pointToLayer) {
                     $layer->setPointToLayer(new Expression($model->pointToLayer));
                 }
 
diff --git a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
index cd5ef0f..d42dd11 100644
--- a/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
+++ b/src/Netzmacht/Contao/Leaflet/Mapper/Layer/VectorsLayerMapper.php
@@ -102,7 +102,10 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
     ) {
         if ($definition instanceof GeoJson) {
             $collection = $this->loadVectorModels($model);
-            $definition->setOption('affectBounds', (bool) $model->affectBounds);
+
+            if ($model->affectBounds) {
+                $definition->setOption('affectBounds', true);
+            }
 
             if ($collection) {
                 foreach ($collection as $item) {
@@ -120,13 +123,7 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
                 }
             }
 
-            if ($model->pointToLayer) {
-                $definition->setPointToLayer(new Expression($model->pointToLayer));
-            }
-
-            if ($model->onEachFeature) {
-                $definition->setOnEachFeature(new Expression($model->onEachFeature));
-            }
+            $this->addCallbacks($definition, $model);
         }
     }
 
@@ -170,4 +167,23 @@ class VectorsLayerMapper extends AbstractLayerMapper implements GeoJsonMapper
     {
         return VectorModel::findActiveBy('pid', $model->id, array('order' => 'sorting'));
     }
+
+    /**
+     * Add javascript callbacks.
+     *
+     * @param GeoJson $definition The definition.
+     * @param \Model  $model      The database model.
+     *
+     * @return void
+     */
+    protected function addCallbacks(GeoJson $definition, \Model $model)
+    {
+        if ($model->pointToLayer) {
+            $definition->setPointToLayer(new Expression($model->pointToLayer));
+        }
+
+        if ($model->onEachFeature) {
+            $definition->setOnEachFeature(new Expression($model->onEachFeature));
+        }
+    }
 }
diff --git a/src/Netzmacht/Contao/Leaflet/ServiceContainer.php b/src/Netzmacht/Contao/Leaflet/ServiceContainer.php
index d948ecc..4396991 100644
--- a/src/Netzmacht/Contao/Leaflet/ServiceContainer.php
+++ b/src/Netzmacht/Contao/Leaflet/ServiceContainer.php
@@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet;
 use Netzmacht\Contao\Leaflet\Frontend\ValueFilter;
 
 /**
- * Class ServiceContainer
+ * Class ServiceContainer provides the services which are available for Contao leaflet.
  *
  * @package Netzmacht\Contao\Leaflet
  */
diff --git a/src/Netzmacht/Contao/Leaflet/ServiceContainerTrait.php b/src/Netzmacht/Contao/Leaflet/ServiceContainerTrait.php
index b789358..fddd5b5 100644
--- a/src/Netzmacht/Contao/Leaflet/ServiceContainerTrait.php
+++ b/src/Netzmacht/Contao/Leaflet/ServiceContainerTrait.php
@@ -22,6 +22,7 @@ trait ServiceContainerTrait
      * Get the service container.
      *
      * @return ServiceContainer
+     * @SuppressWarnings(PHPMD.Superglobals)
      */
     protected function getServiceContainer()
     {
diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php
index 34ee522..009242e 100644
--- a/src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php
+++ b/src/Netzmacht/Contao/Leaflet/Subscriber/HashSubscriber.php
@@ -46,7 +46,7 @@ class HashSubscriber implements EventSubscriberInterface
         $data = $event->getData();
 
         if ($data instanceof \Model) {
-            $event->setHash($data->getTable() . '.' . $data->{$data->getPk()});
+            $event->setHash($data->getTable() . '::' . $data->{$data->getPk()});
         }
     }