diff --git a/src/Gambits/TagGambit.php b/src/Gambits/TagGambit.php
index b8b52361..43454f01 100644
--- a/src/Gambits/TagGambit.php
+++ b/src/Gambits/TagGambit.php
@@ -3,6 +3,7 @@
 use Flarum\Tags\TagRepository;
 use Flarum\Core\Search\Search;
 use Flarum\Core\Search\RegexGambit;
+use Illuminate\Database\Query\Expression;
 
 class TagGambit extends RegexGambit
 {
@@ -32,7 +33,7 @@ protected function conditions(Search $search, array $matches, $negate)
                     $query->orWhereNotExists(function ($query) {
                         $query->select(app('flarum.db')->raw(1))
                               ->from('discussions_tags')
-                              ->whereRaw('discussion_id = discussions.id');
+                              ->where('discussions.id', new Expression('discussion_id'));
                     });
                 } else {
                     $id = $this->tags->getIdForSlug($slug);
@@ -40,7 +41,8 @@ protected function conditions(Search $search, array $matches, $negate)
                     $query->orWhereExists(function ($query) use ($id) {
                         $query->select(app('flarum.db')->raw(1))
                               ->from('discussions_tags')
-                              ->whereRaw('discussion_id = discussions.id AND tag_id = ?', [$id]);
+                              ->where('discussions.id', new Expression('discussion_id'))
+                              ->where('tag_id', $id);
                     });
                 }
             }
diff --git a/src/Listeners/AddTagGambit.php b/src/Listeners/AddTagGambit.php
index 2ebd0a4a..51dd98a4 100755
--- a/src/Listeners/AddTagGambit.php
+++ b/src/Listeners/AddTagGambit.php
@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Events\Dispatcher;
 use Flarum\Tags\Gambits\TagGambit;
 use Flarum\Tags\Tag;
+use Illuminate\Database\Query\Expression;
 
 class AddTagGambit
 {
@@ -33,7 +34,7 @@ public function hideTags(DiscussionSearchWillBePerformed $event)
             return $query->select(app('flarum.db')->raw(1))
                 ->from('discussions_tags')
                 ->whereIn('tag_id', Tag::where('is_hidden', 1)->lists('id'))
-                ->whereRaw('discussion_id = ' . app('flarum.db')->getQueryGrammar()->wrap('discussions.id'));
+                ->where('discussions.id', new Expression('discussion_id'));
         });
     }
 }
diff --git a/src/Listeners/ConfigureDiscussionPermissions.php b/src/Listeners/ConfigureDiscussionPermissions.php
index e2f2a577..6cf1641a 100755
--- a/src/Listeners/ConfigureDiscussionPermissions.php
+++ b/src/Listeners/ConfigureDiscussionPermissions.php
@@ -4,6 +4,7 @@
 use Flarum\Events\ModelAllow;
 use Flarum\Core\Discussions\Discussion;
 use Flarum\Tags\Tag;
+use Illuminate\Database\Query\Expression;
 
 class ConfigureDiscussionPermissions
 {
@@ -21,7 +22,7 @@ public function scopeDiscussionVisibility(ScopeModelVisibility $event)
                 return $query->select(app('flarum.db')->raw(1))
                     ->from('discussions_tags')
                     ->whereIn('tag_id', Tag::getNotVisibleTo($event->actor))
-                    ->whereRaw('discussion_id = ' . app('flarum.db')->getQueryGrammar()->wrap('discussions.id'));
+                    ->where('discussions.id', new Expression('discussion_id'));
             });
         }
     }