diff --git a/bash_completion.bash b/bash_completion.bash
index 34f5906..0a9f838 100755
--- a/bash_completion.bash
+++ b/bash_completion.bash
@@ -110,6 +110,8 @@ __pom_hierarchy()
         fi
     	POM_HIERARCHY+=("$pom")
     done
+    # Include also any pom from modules
+    for pom in $(find -mindepth 2 -name pom.xml); do POM_HIERARCHY+=("$pom"); done
 }
 
 _mvn()
@@ -196,7 +198,7 @@ _mvn()
     local profiles="${profile_settings}|"
     for item in ${POM_HIERARCHY[*]}
     do
-        local profile_pom=`[ -e $item ] && grep -e "<profile>" -A 1 $item | grep -e "<id>.*</id>" | sed 's/.*<id>//' | sed 's/<\/id>.*//g' | tr '\n' '|' `
+        local profile_pom=`[ -e $item ] && grep -e "<profile>" -A 1000 $item | grep --before-context=1000 '</profiles>' | grep -e "<id>.*</id>" | sed 's/.*<id>//' | sed 's/<\/id>.*//g' | tr '\n' '|' `
         local profiles="${profiles}|${profile_pom}"
     done