diff --git a/app/controllers/admin/communication/photo_imports_controller.rb b/app/controllers/admin/communication/photo_imports_controller.rb
index 231e78b1d4f922e85c2a5a31fd9544867d7bd26f..a98aac1b7cbf3b7d6f47d0cb5a33d72291cae154 100644
--- a/app/controllers/admin/communication/photo_imports_controller.rb
+++ b/app/controllers/admin/communication/photo_imports_controller.rb
@@ -1,36 +1,37 @@
 class Admin::Communication::PhotoImportsController < Admin::Communication::ApplicationController
   layout false
+  before_action :prepare
 
   def unsplash
-    @query = params[:query]
-    @search = []
-    @total = 0
-    @total_pages = 0
-    if @query.present?
-      p = {
-        query: @query,
-        page: (params[:page].presence || 1),
-        per_page: (params[:per_page].presence || 10),
-        lang: (params[:lang].presence || 'en')
-      }
-      p[:orientation] = params[:orientation] if params.has_key? :orientation
-      @search = Unsplash::Search.search "/search/photos", Unsplash::Photo, p
-      @total = @search.total
-      @total_pages = @search.total_pages
-    end
+    return if @query.blank?
+    p = {
+      query: @query,
+      page: @page,
+      per_page: @per_page,
+      lang: @lang
+    }
+    p[:orientation] = params[:orientation] if params.has_key? :orientation
+    @search = Unsplash::Search.search "/search/photos", Unsplash::Photo, p
+    @total = @search.total
+    @total_pages = @search.total_pages
   end
 
   def pexels
-    @query = params[:query]
+    return if @query.blank?
+    @search = Pexels::Client.new.photos.search(@query, page: @page, per_page: @per_page)
+    @total = @search.total_results
+    @total_pages = @search.total_pages
+  end
+
+  protected
+
+  def prepare
+    @query = "#{params[:query]}"
+    @page = params[:page].presence || 1
+    @per_page = params[:per_page].presence || 12
+    @lang = params[:lang].presence || 'en'
     @search = []
     @total = 0
     @total_pages = 0
-    if @query.present?
-      page = params[:page].presence || 1
-      per_page = params[:per_page].presence || 10
-      @search = Pexels::Client.new.photos.search(@query, page: page, per_page: per_page)
-      @total = @search.total_results
-      @total_pages = @search.total_pages
-    end
   end
 end