diff --git a/lib/ulib/ptools b/lib/ulib/ptools
index 09b348a..57ef41a 100644
--- a/lib/ulib/ptools
+++ b/lib/ulib/ptools
@@ -37,10 +37,8 @@ function is_any_branch() {
             [ "$branch" == "develop" ] && continue
             [[ "$branch" == release-* ]] && continue
             [[ "$branch" == hotfix-* ]] && continue
-            if [ -n "$annex" ]; then
-                [ "$branch" == "git-annex" ] && continue
-                [[ "$branch" == synced/* ]] && continue
-            fi
+            [ -n "$annex" -a "$branch" == "git-annex" ] && continue
+            [[ "$branch" == */* ]] && continue
             return 0
             ;;
         -m|-master)
@@ -61,10 +59,8 @@ function is_any_branch() {
             [ "$branch" == "develop" ] && continue
             [[ "$branch" == release-* ]] && continue
             [[ "$branch" == hotfix-* ]] && continue
-            if [ -n "$annex" ]; then
-                [ "$branch" == "git-annex" ] && continue
-                [[ "$branch" == synced/* ]] && continue
-            fi
+            [ -n "$annex" -a "$branch" == "git-annex" ] && continue
+            [[ "$branch" == */* ]] && continue
             return 1
             ;;
         esac
@@ -92,9 +88,9 @@ function list_feature_branches() {
     grep -vF develop |
     grep -v '^release-' |
     grep -v '^hotfix-' |
+    grep -v '/' |
     if git_have_annex; then
-        grep -vF git-annex |
-        grep -v '^synced/'
+        grep -vF git-annex
     else
         cat
     fi