Pimcore has improper quoting of columns when calling methods "getByUuid" & "exists" on UUID Model

@@ -15,6 +15,7 @@
 
 namespace Pimcore\Model\Tool\UUID;
 
+use Doctrine\DBAL\Types\Types;
 use Pimcore\Db\Helper;
 use Pimcore\Model;
 
@@ -80,7 +81,17 @@ public function delete()
      */
     public function getByUuid($uuid)
     {
-        $data = $this->db->fetchAssociative('SELECT * FROM ' . self::TABLE_NAME ." where uuid='" . $uuid . "'");
+        $queryBuilder = $this->db->createQueryBuilder();
+        $queryBuilder
+            ->select('*')
+            ->from(self::TABLE_NAME)
+            ->where('uuid = :uuid')
+            ->setParameter('uuid', $uuid, Types::STRING);
+
+        $data = $queryBuilder
+            ->execute()
+            ->fetchAssociative();
+
         $model = new Model\Tool\UUID();
         $model->setValues($data);
 
@@ -94,6 +105,18 @@ public function getByUuid($uuid)
      */
     public function exists($uuid)
     {
-        return (bool) $this->db->fetchOne('SELECT uuid FROM ' . self::TABLE_NAME . ' where uuid = ?', [$uuid]);
+        $queryBuilder = $this->db->createQueryBuilder();
+        $queryBuilder
+            ->select('uuid')
+            ->from(self::TABLE_NAME)
+            ->where('uuid = :uuid')
+            ->setParameter('uuid', $uuid, Types::STRING);
+
+
+        $result = $queryBuilder
+            ->execute()
+            ->fetchOne();
+
+        return (bool) $result;
     }
 }