diff --git a/firewall/firewall-add b/firewall/firewall-add
index df37acd..7aaec56 100755
--- a/firewall/firewall-add
+++ b/firewall/firewall-add
@@ -31,6 +31,7 @@ set | grep ROLES
               DEBUG=1
       fi;
 
+
 # finding IPv4 addresses from application names.
 name_resolver() {
 
@@ -50,10 +51,10 @@ name_resolver() {
                                                                                                                   
                         UPS=""                                                                                    
                         for ROLE in $(echo $ROLES); do
-				FILTERED_BY_ROLE=$(docker inspect $UP -f '{{.Config.Labels.roles}}' | uniq | grep $ROLE)
-				if [[ "$(echo $FILTERED_BY_ROLE)" != "" ]]; then                                             
-					UPS="$UPS $UP";
-                                fi
+                               	FILTERED_BY_ROLE=$(docker inspect $UP -f '{{.Name}} {{.Config.Labels.roles}}' | uniq | grep $ROLE| awk '{print $1}')
+                                if [[ "$(echo $FILTERED_BY_ROLE)" != "" ]]; then                                                                    
+                                        UPS="$UPS $FILTERED_BY_ROLE";     
+				fi
                         done 
                                                                                                 
                         UP=$UPS                                                                                              
@@ -166,7 +167,6 @@ prerouting() {
 
 postrouting() {
 
-	
 	if [[ ! -z "$SOURCE_IP" ]]; then
 	SOURCE_IP_FOR_POSTROUTING="$(echo $SOURCE_IP | cut -d . -f1-3).0/24";
 	debug "source ip is $SOURCE_IP_FOR_POSTROUTING"