check variables

@@ -21,9 +21,11 @@ module Kanjai
               current_page = current_page.parent
             end
           end
-          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0], current_page)
+          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0], true, current_page)
+        elsif type == 'menu'
+          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0], false )
         else
-          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0])
+          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0] )
         end
       end
 
@@ -39,7 +41,7 @@ module Kanjai
 
 
 
-    def self.menu_generator(session, domain, elements, subparts, hash_value, current_page = nil)
+    def self.menu_generator(session, domain, elements, subparts, hash_value, start_from_current_page, current_page = nil)
         elements.each do |item|
           case item[:name]
             when 'text'
@@ -61,7 +63,7 @@ module Kanjai
               if normal_state
                 doc_normal_state = Nokogiri::HTML::DocumentFragment.parse ""
                 Nokogiri::HTML::Builder.with(doc_normal_state) do |repeat_part|
-                  self.menu_generator(session, domain, normal_state[:children], repeat_part, nil)
+                  self.menu_generator(session, domain, normal_state[:children], repeat_part, nil, false)
                 end
                 normal_state_template = doc_normal_state.to_html
               end
@@ -69,7 +71,7 @@ module Kanjai
               if active_state
                 doc_active_state = Nokogiri::HTML::DocumentFragment.parse ""
                 Nokogiri::HTML::Builder.with(doc_active_state) do |repeat_part|
-                  self.menu_generator(session, domain, active_state[:children], repeat_part, nil)
+                  self.menu_generator(session, domain, active_state[:children], repeat_part, nil, false)
                 end
                 active_state_template = doc_active_state.to_html
               end
@@ -77,7 +79,7 @@ module Kanjai
               if separator
                 doc_separator = Nokogiri::HTML::DocumentFragment.parse ""
                 Nokogiri::HTML::Builder.with(doc_separator) do |repeat_part|
-                  self.menu_generator(session, domain, separator[:children], repeat_part, nil)
+                  self.menu_generator(session, domain, separator[:children], repeat_part, nil, false)
                 end
                 separator_template = doc_separator.to_html
               end
@@ -99,7 +101,11 @@ module Kanjai
               end
 
               unless current_page.nil?
-                page_collection = page_collection.where(:parent_id => current_page.id)
+                if start_from_current_page                  
+                  page_collection = page_collection.where(:id => current_page.id)
+                else
+                  page_collection = page_collection.where(:parent_id => current_page.id)
+                end
               end
 
               begin
@@ -120,7 +126,7 @@ module Kanjai
                 if page.children.length > 0 and next_level
                   subparts << item[:source]
 
-                  self.menu_generator(session, domain, next_level[:children], subparts, nil, page)
+                  self.menu_generator(session, domain, next_level[:children], subparts, nil, false, page)
                 else
 
                   if session[:url] == page.lang_attributes(I18n.locale, :url)
@@ -150,7 +156,7 @@ module Kanjai
                   p attributes
                 end
                 subparts.send(item[:name].to_s, attributes) do |next_subparts|
-                  self.menu_generator(session, domain, item[:children], next_subparts, nil, current_page)
+                  self.menu_generator(session, domain, item[:children], next_subparts, nil, start_from_current_page, current_page)
                 end
           end
 
@@ -241,7 +247,7 @@ module Kanjai
 
             row_index.each_with_index do |row_index, position|
               value = scope.where(row_item: row_index).collect{|item| [item.marker, item.text_value] }.to_h
-
+              value = value.merge(hash_value)
               if(position == 0)
                 value['###FIRST_ITEM_ACTIVE###'] = 'active show'
                 value['###FIRST_ITEM_TRUE###'] = 'true'

 module Kanjai
-  VERSION = "0.0.307"
+  VERSION = "0.0.308"
 end