diff --git a/inc/Data/UserPostQueries.php b/inc/Data/UserPostQueries.php
index 52671dc5..072157ea 100644
--- a/inc/Data/UserPostQueries.php
+++ b/inc/Data/UserPostQueries.php
@@ -2,6 +2,7 @@
 namespace Vichan\Data;
 
 use Vichan\Functions\Net;
+use Vichan\Data\Model\PageFetchResult;
 
 
 /**
diff --git a/inc/Service/SearchService.php b/inc/Service/SearchService.php
index 01792dad..c57d96a9 100644
--- a/inc/Service/SearchService.php
+++ b/inc/Service/SearchService.php
@@ -2,7 +2,8 @@
 namespace Vichan\Service;
 
 use Vichan\Data\Driver\Log\LogDriver;
-use Vichan\Data\{FiltersParseResult, UserPostQueries, SearchFilters, SearchQueries};
+use Vichan\Data\{UserPostQueries, SearchQueries};
+use Vichan\Data\Model\{FiltersParseResult, SearchFilters};
 
 
 class SearchService {
diff --git a/inc/context.php b/inc/context.php
index 1ba4d9c7..ae6caa17 100644
--- a/inc/context.php
+++ b/inc/context.php
@@ -1,9 +1,10 @@
 <?php
 namespace Vichan;
 
-use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries, Flags};
+use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries};
 use Vichan\Data\Driver\Cache\CacheDriver;
 use Vichan\Data\Driver\Log\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
+use Vichan\Data\Model\Flags;
 use Vichan\Service\SearchService;
 
 defined('TINYBOARD') or exit;