diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php
index 45ff02564..352894e77 100644
--- a/app/Transformer/Api/AccountTransformer.php
+++ b/app/Transformer/Api/AccountTransformer.php
@@ -7,27 +7,27 @@ use League\Fractal;
 
 class AccountTransformer extends Fractal\TransformerAbstract
 {
-    public function transform(Profile $profile)
-    {
-        return [
-          'id'              => $profile->id,
-          'username'        => $profile->username,
-          'acct'            => $profile->username,
-          'display_name'    => $profile->name,
-          'locked'          => (bool) $profile->is_private,
-          'created_at'      => $profile->created_at->format('c'),
-          'followers_count' => $profile->followerCount(),
-          'following_count' => $profile->followingCount(),
-          'statuses_count'  => $profile->statusCount(),
-          'note'            => $profile->bio,
-          'url'             => $profile->url(),
-          'avatar'          => $profile->avatarUrl(),
-          'avatar_static'   => $profile->avatarUrl(),
-          'header'          => null,
-          'header_static'   => null,
-          'moved'           => null,
-          'fields'          => null,
-          'bot'             => null,
-      ];
-    }
+	public function transform(Profile $profile)
+	{
+		return [
+			'id' => $profile->id,
+			'username' => $profile->username,
+			'acct' => $profile->username,
+			'display_name' => $profile->name,
+			'locked' => (bool) $profile->is_private,
+			'created_at' => $profile->created_at->format('c'),
+			'followers_count' => $profile->followerCount(),
+			'following_count' => $profile->followingCount(),
+			'statuses_count' => $profile->statusCount(),
+			'note' => $profile->bio,
+			'url' => $profile->url(),
+			'avatar' => $profile->avatarUrl(),
+			'avatar_static' => $profile->avatarUrl(),
+			'header' => null,
+			'header_static' => null,
+			'moved' => null,
+			'fields' => null,
+			'bot' => null,
+		];
+	}
 }
diff --git a/app/Transformer/Api/ApplicationTransformer.php b/app/Transformer/Api/ApplicationTransformer.php
index 23e29afd5..158fe9ae1 100644
--- a/app/Transformer/Api/ApplicationTransformer.php
+++ b/app/Transformer/Api/ApplicationTransformer.php
@@ -6,11 +6,11 @@ use League\Fractal;
 
 class ApplicationTransformer extends Fractal\TransformerAbstract
 {
-    public function transform()
-    {
-        return [
-        'name'    => '',
-        'website' => null,
-      ];
-    }
+	public function transform()
+	{
+		return [
+			'name'    => '',
+			'website' => null,
+		];
+	}
 }
diff --git a/app/Transformer/Api/AttachmentTransformer.php b/app/Transformer/Api/AttachmentTransformer.php
new file mode 100644
index 000000000..2e1be8449
--- /dev/null
+++ b/app/Transformer/Api/AttachmentTransformer.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Transformer\Api;
+
+use League\Fractal;
+
+class AttachmentTransformer extends Fractal\TransformerAbstract
+{
+	public function transform(Media $media)
+	{
+		return [
+			'id'			=> $media->id,
+			'type'			=> $media->activityVerb(),
+			'url'			=> $media->url(),
+			'remote_url' 	=> null,
+			'preview_url'	=> $media->thumbnailUrl(),
+			'text_url'		=> null,
+			'meta'			=> null,
+			'description'	=> $media->caption,
+			'license'		=> $media->license,
+			'is_nsfw'		=> $media->is_nsfw,
+			'orientation'	=> $media->orientation,
+			'filter_name'	=> $media->filter_name,
+			'filter_class'	=> $media->filter_class,
+			'mime'			=> $media->mime,
+		];
+	}
+}
diff --git a/app/Transformer/Api/ContextTransformer.php b/app/Transformer/Api/ContextTransformer.php
new file mode 100644
index 000000000..0a6c7822b
--- /dev/null
+++ b/app/Transformer/Api/ContextTransformer.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Transformer\Api;
+
+use League\Fractal;
+
+class ContextTransformer extends Fractal\TransformerAbstract
+{
+	public function transform()
+	{
+		return [
+			'ancestors' => [],
+			'descendants' => []
+		];
+	}
+}
diff --git a/app/Transformer/Api/EmojiTransformer.php b/app/Transformer/Api/EmojiTransformer.php
index 0d7fd10f7..93c7437cc 100644
--- a/app/Transformer/Api/EmojiTransformer.php
+++ b/app/Transformer/Api/EmojiTransformer.php
@@ -6,13 +6,13 @@ use League\Fractal;
 
 class EmojiTransformer extends Fractal\TransformerAbstract
 {
-    public function transform($emoji)
-    {
-        return [
-            'shortcode' 			=> '',
-            'static_url'			=> '',
-            'url'					=> '',
-            'visible_in_picker' 	=> false
-        ];
-    }
+	public function transform($emoji)
+	{
+		return [
+			'shortcode' 			=> '',
+			'static_url'			=> '',
+			'url'					=> '',
+			'visible_in_picker' 	=> false
+		];
+	}
 }
diff --git a/app/Transformer/Api/FilterTransformer.php b/app/Transformer/Api/FilterTransformer.php
new file mode 100644
index 000000000..92a6d7d7d
--- /dev/null
+++ b/app/Transformer/Api/FilterTransformer.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Transformer\Api;
+
+use League\Fractal;
+
+class FilterTransformer extends Fractal\TransformerAbstract
+{
+	public function transform()
+	{
+		return [
+			'id' => (string) '',
+			'phrase' => (string) '',
+			'context' => [],
+			'expires_at' => null,
+			'irreversible' => (bool) false,
+			'whole_word' => (bool) false
+		];
+	}
+}
diff --git a/app/Transformer/Api/HashtagTransformer.php b/app/Transformer/Api/HashtagTransformer.php
index 153c311cc..b11c0e3b8 100644
--- a/app/Transformer/Api/HashtagTransformer.php
+++ b/app/Transformer/Api/HashtagTransformer.php
@@ -7,11 +7,11 @@ use League\Fractal;
 
 class HashtagTransformer extends Fractal\TransformerAbstract
 {
-    public function transform(Hashtag $hashtag)
-    {
-        return [
-            'name' => $hashtag->name,
-            'url'  => $hashtag->url(),
-        ];
-    }
+	public function transform(Hashtag $hashtag)
+	{
+		return [
+			'name' => $hashtag->name,
+			'url'  => $hashtag->url(),
+		];
+	}
 }
diff --git a/app/Transformer/Api/MediaTransformer.php b/app/Transformer/Api/MediaTransformer.php
index 8ab38fc6f..2920bea1e 100644
--- a/app/Transformer/Api/MediaTransformer.php
+++ b/app/Transformer/Api/MediaTransformer.php
@@ -10,20 +10,20 @@ class MediaTransformer extends Fractal\TransformerAbstract
     public function transform(Media $media)
     {
         return [
-            'id'          => $media->id,
-            'type'        => $media->activityVerb(),
-            'url'         => $media->url(),
-            'remote_url'  => null,
-            'preview_url' => $media->thumbnailUrl(),
-            'text_url'    => null,
-            'meta'        => null,
-            'description' => $media->caption,
-            'license'     => $media->license,
-            'is_nsfw'     => $media->is_nsfw,
-            'orientation' => $media->orientation,
-            'filter_name' => $media->filter_name,
-            'filter_class' => $media->filter_class,
-            'mime'        => $media->mime,
+            'id'            => $media->id,
+            'type'          => $media->activityVerb(),
+            'url'           => $media->url(),
+            'remote_url'    => null,
+            'preview_url'   => $media->thumbnailUrl(),
+            'text_url'      => null,
+            'meta'          => null,
+            'description'   => $media->caption,
+            'license'       => $media->license,
+            'is_nsfw'       => $media->is_nsfw,
+            'orientation'   => $media->orientation,
+            'filter_name'   => $media->filter_name,
+            'filter_class'  => $media->filter_class,
+            'mime'          => $media->mime,
         ];
     }
 }
diff --git a/app/Transformer/Api/ResultsTransformer.php b/app/Transformer/Api/ResultsTransformer.php
new file mode 100644
index 000000000..ea2473605
--- /dev/null
+++ b/app/Transformer/Api/ResultsTransformer.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Transformer\Api;
+
+use League\Fractal;
+
+class ResultsTransformer extends Fractal\TransformerAbstract
+{
+
+	protected $defaultIncludes = [
+		'account',
+		'mentions',
+		'media_attachments',
+		'tags',
+	];
+	public function transform()
+	{
+		return [
+			'accounts' => [],
+			'statuses' => [],
+			'hashtags' => []
+		];
+	}
+}