diff --git a/includes/core/class-common.php b/includes/core/class-common.php
index bf1cec77..9e53bc7f 100644
--- a/includes/core/class-common.php
+++ b/includes/core/class-common.php
@@ -94,7 +94,7 @@ if ( ! class_exists( 'Common' ) ) {
             global $wp_query;
 
             //We need main query
-            if ( $q == $wp_query->request ) {
+            if ( isset( $wp_query->request ) && $q == $wp_query->request ) {
 
                 if ( ! empty( $wp_query->query_vars['um_page'] ) ) {
 
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 39dc2a03..367ffad3 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -139,9 +139,11 @@ if ( ! class_exists( 'Shortcodes' ) ) {
         }
 
 
-        /***
-         ***	@load a compatible template
-         */
+	    /**
+	     * Load a compatible template
+	     *
+	     * @param $tpl
+	     */
         function load_template( $tpl ) {
             $loop = ( $this->loop ) ? $this->loop : array();
 
@@ -150,6 +152,7 @@ if ( ! class_exists( 'Shortcodes' ) ) {
                 
                 unset( $args['file'] );
                 unset( $args['theme_file'] );
+                unset( $args['tpl'] );
 
                 extract( $args );
             }