--- orig/systemctl	2015-01-01 15:22:40.321734460 +0200
+++ patch/systemctl	2015-01-01 15:26:35.297714222 +0200
@@ -182,8 +182,8 @@
                 comps=$( __filter_units_by_property $mode CanStart yes \
                       $( __get_all_units $mode \
                         | while read -r line; do \
-                                [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo " $line"; \
-                        done ))
+                          [[ "$line" =~ @\.|\.(device|snapshot|socket|timer)$ ]] || echo " $line"; \
+                        done ) )
                 compopt -o filenames
 
         elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
@@ -198,7 +198,10 @@
 
         elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
                 comps=$( __filter_units_by_property $mode AllowIsolate yes \
-                      $( __get_all_units $mode ) )
+                      $( __get_all_units $mode \
+		        | while read -r line; do \
+			  [[ "$line" =~ @\. ]] || echo " $line"; \
+		        done ) )
                 compopt -o filenames
 
         elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then