diff --git a/modules/menu/queries/deleteMenu.xml b/modules/menu/queries/deleteMenu.xml
index aca40ac0e..344bc9af0 100644
--- a/modules/menu/queries/deleteMenu.xml
+++ b/modules/menu/queries/deleteMenu.xml
@@ -1,8 +1,8 @@
diff --git a/modules/menu/queries/deleteMenuItem.xml b/modules/menu/queries/deleteMenuItem.xml
index a1edf3d8e..2d09a5227 100644
--- a/modules/menu/queries/deleteMenuItem.xml
+++ b/modules/menu/queries/deleteMenuItem.xml
@@ -1,8 +1,8 @@
-
diff --git a/modules/menu/queries/getMenuItem.xml b/modules/menu/queries/getMenuItem.xml
new file mode 100644
index 000000000..3245463bb
--- /dev/null
+++ b/modules/menu/queries/getMenuItem.xml
@@ -0,0 +1,11 @@
+
diff --git a/modules/menu/queries/getMenuItems.xml b/modules/menu/queries/getMenuItems.xml
new file mode 100644
index 000000000..ed0f5ff3f
--- /dev/null
+++ b/modules/menu/queries/getMenuItems.xml
@@ -0,0 +1,14 @@
+
diff --git a/modules/menu/queries/getMenuList.xml b/modules/menu/queries/getMenuList.xml
index a8be6793d..b705e0eb2 100644
--- a/modules/menu/queries/getMenuList.xml
+++ b/modules/menu/queries/getMenuList.xml
@@ -5,11 +5,7 @@
-
-
-
-
-
+
diff --git a/modules/menu/queries/insertMenu.xml b/modules/menu/queries/insertMenu.xml
index 8f0e7a186..c5b22837e 100644
--- a/modules/menu/queries/insertMenu.xml
+++ b/modules/menu/queries/insertMenu.xml
@@ -4,16 +4,7 @@
-
-
-
-
-
-
-
-
-
-
+
diff --git a/modules/menu/queries/insertMenuItem.xml b/modules/menu/queries/insertMenuItem.xml
new file mode 100644
index 000000000..97084d065
--- /dev/null
+++ b/modules/menu/queries/insertMenuItem.xml
@@ -0,0 +1,19 @@
+
diff --git a/modules/menu/queries/updateMenu.xml b/modules/menu/queries/updateMenu.xml
index ff4aaf6ea..ba21fcb72 100644
--- a/modules/menu/queries/updateMenu.xml
+++ b/modules/menu/queries/updateMenu.xml
@@ -3,14 +3,7 @@
-
-
-
-
-
-
-
-
+
diff --git a/modules/menu/queries/updateMenuItem.xml b/modules/menu/queries/updateMenuItem.xml
new file mode 100644
index 000000000..986300365
--- /dev/null
+++ b/modules/menu/queries/updateMenuItem.xml
@@ -0,0 +1,18 @@
+
diff --git a/modules/menu/queries/updateMenuParent.xml b/modules/menu/queries/updateMenuItemParent.xml
similarity index 53%
rename from modules/menu/queries/updateMenuParent.xml
rename to modules/menu/queries/updateMenuItemParent.xml
index d531f1ce3..d8c4ca707 100644
--- a/modules/menu/queries/updateMenuParent.xml
+++ b/modules/menu/queries/updateMenuItemParent.xml
@@ -1,12 +1,12 @@
-