diff --git a/sites/all/modules/og_menu/og_menu.module b/sites/all/modules/og_menu/og_menu.module
index 83b38f6..30c5317 100644
--- a/sites/all/modules/og_menu/og_menu.module
+++ b/sites/all/modules/og_menu/og_menu.module
@@ -118,19 +118,17 @@ function og_menu_form_alter(&$form, $form_state, $form_id) {
         // get menu options for user
         $result = db_query("
           SELECT * 
-          FROM {menu_custom} 
-          JOIN (
-            {og_uid},
-            {og_menu_groups}
-          ) 
+          FROM {menu_custom} mc
+          JOIN {og_menu_groups} og_mg
           ON (
-            {menu_custom}.menu_name = {og_menu_groups}.mid 
-            AND 
-            {og_menu_groups}.gid = {og_uid}.nid
+            mc.menu_name = og_mg.mid
           ) 
-          WHERE {og_uid}.uid = $user->uid 
-          ORDER BY menu_name
-          ;"
+          JOIN {og_uid} og_u
+          ON (
+            og_mg.gid = og_u.nid
+          )
+          WHERE og_u.uid = %d
+          ORDER BY menu_name", $user->uid
         );
         
         // filter Parent item list to reveal only member associated groups as parents
@@ -259,16 +257,20 @@ function _og_menu_menu_options($mid) {
 
   // get all related group pages
   $sql = db_query("
-    SELECT {og_ancestry}.nid, {node}.title FROM {og_ancestry} 
-    JOIN ({og_menu_groups}, {node}, {og_uid}) 
+    SELECT DISTINCT og_a.nid, n.title FROM {og_ancestry} og_a
+    JOIN {og_uid} og_u
     ON (
-      {og_ancestry}.group_nid = {og_uid}.nid 
-      AND 
-      {og_menu_groups}.gid = {og_uid}.nid
-      AND
-      {og_ancestry}.nid = {node}.nid
-    ) 
-    WHERE {og_menu_groups}.mid = '%s';", 
+      og_a.group_nid = og_u.nid
+    )
+    JOIN {og_menu_groups} og_mg
+    ON (
+      og_mg.gid = og_u.nid
+    )
+    JOIN {node} n
+    ON (
+      og_a.nid = n.nid
+    )
+    WHERE og_mg.mid = '%s'",
     $mid
   );
   
@@ -293,8 +295,7 @@ function _og_menu_defaults($mid) {
   $sql = db_query("
     SELECT * 
     FROM {og_menu_groups} 
-    WHERE mid = '%s'
-    ;",
+    WHERE mid = '%s'",
     $mid
   );
   while($row = db_fetch_array($sql)) {
@@ -320,7 +321,7 @@ function _og_menu_defaults($mid) {
 function _og_menu_menus() {
   $list = array();
 
-  $sql = db_query("SELECT mid FROM {og_menu_groups};");
+  $sql = db_query("SELECT mid FROM {og_menu_groups}");
   
   while ($item = db_fetch_array($sql)) {
     $list[] = $item['mid'];
@@ -366,7 +367,7 @@ function _og_menu_edit_menu_submit(&$form, &$form_values) {
         VALUES (
           %d, 
           '%s'
-        );", 
+        )",
         $option, 
         $mid
       );
@@ -378,7 +379,7 @@ function _og_menu_edit_menu_submit(&$form, &$form_values) {
           gid = %d 
           AND 
           mid = '%s'
-        );",
+        )",
         $option,
         $mid);
     }
@@ -398,8 +399,7 @@ function _og_menu_delete_menu_confirm_submit(&$form, $form_id) {
   $sql = db_query("
     SELECT * 
     FROM {og_menu_groups} 
-    WHERE mid = '%s'
-    ;",
+    WHERE mid = '%s'",
     $mid
   );
   while($row = db_fetch_array($sql)) {
@@ -407,8 +407,7 @@ function _og_menu_delete_menu_confirm_submit(&$form, $form_id) {
     db_query("
       DELETE 
       FROM {og_menu_groups} 
-      WHERE mid = '%s'
-      ;",
+      WHERE mid = '%s'",
       $mid
     );
   }
@@ -428,27 +427,28 @@ function _og_menu_get_menu_block() {
   // get menu for group main and sub pages only
   $sql = db_query("
     SELECT DISTINCT *
-    FROM {og_ancestry} 
-    JOIN (
-      {og_menu_groups},
-      {menu_custom}
+    FROM {og_ancestry} og_a
+    JOIN {og_menu_groups} og_mg
+    ON (
+      og_a.group_nid = og_mg.gid
     ) 
+    JOIN {menu_custom} mc
     ON (
-      {og_menu_groups}.mid = {menu_custom}.menu_name
+      og_mg.mid = mc.menu_name
     ) 
     WHERE (
       (
-        {og_ancestry}.nid = %d
+        og_a.nid = %d
         AND
-        {og_ancestry}.group_nid = {og_menu_groups}.gid
+        og_a.group_nid = og_mg.gid
       )
       OR
       (
-        {og_menu_groups}.gid = %d
+        og_mg.gid = %d
         AND
-        {og_ancestry}.group_nid = {og_menu_groups}.gid
+        og_a.group_nid = og_mg.gid
       )
-    );", 
+    )",
     $nid, 
     $nid
   );