diff --git a/.gitignore b/.gitignore
index b59bed9bb4..d58cb9cb4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 Homestead.yaml
 Homestead.json
 .env
-.idea/
 _ide_helper.php
 _ide_helper_models.php
 .phpstorm.meta.php
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 5e9a0fcf0c..bafd1d793d 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -17,6 +17,7 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Input;
 use Preferences;
 use Response;
@@ -177,22 +178,21 @@ class RuleController extends Controller
         $this->createDefaultRuleGroup();
         $this->createDefaultRule();
 
-
         $ruleGroups = Auth::user()
                           ->ruleGroups()
                           ->orderBy('active', 'DESC')
                           ->orderBy('order', 'ASC')
                           ->with(
                               [
-                                  'rules'              => function ($query) {
+                                  'rules'              => function (HasMany $query) {
                                       $query->orderBy('active', 'DESC');
                                       $query->orderBy('order', 'ASC');
 
                                   },
-                                  'rules.ruleTriggers' => function ($query) {
+                                  'rules.ruleTriggers' => function (HasMany $query) {
                                       $query->orderBy('order', 'ASC');
                                   },
-                                  'rules.ruleActions'  => function ($query) {
+                                  'rules.ruleActions'  => function (HasMany $query) {
                                       $query->orderBy('order', 'ASC');
                                   },
                               ]
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 7032eb9bf2..b67cee9d53 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -4,7 +4,7 @@ namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;
-
+use Illuminate\Http\Request;
 /**
  * Class Authenticate
  *
@@ -21,7 +21,7 @@ class Authenticate
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->guest()) {
             if ($request->ajax()) {
diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php
index 35acc9d20e..c35b442513 100644
--- a/app/Http/Middleware/Binder.php
+++ b/app/Http/Middleware/Binder.php
@@ -4,6 +4,8 @@ namespace FireflyIII\Http\Middleware;
 
 use Closure;
 use FireflyIII\Support\Domain;
+use Illuminate\Http\Request;
+
 
 /**
  * Class Binder
@@ -30,7 +32,7 @@ class Binder
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         foreach ($request->route()->parameters() as $key => $value) {
             if (isset($this->binders[$key])) {
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index 36155e56d3..76707624a4 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -6,6 +6,7 @@ namespace FireflyIII\Http\Middleware;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Navigation;
 use Preferences;
@@ -48,7 +49,7 @@ class Range
      * @return mixed
      * @internal param Closure $next
      */
-    public function handle($request, Closure $theNext, $guard = null)
+    public function handle(Request $request, Closure $theNext, $guard = null)
     {
         if (!Auth::guard($guard)->guest()) {
             // ignore preference. set the range to be the current month: