diff --git a/aws_list_all/__main__.py b/aws_list_all/__main__.py
index 322c8f3..15a87c9 100755
--- a/aws_list_all/__main__.py
+++ b/aws_list_all/__main__.py
@@ -140,10 +140,6 @@ def main():
     )
 
     args = parser.parse_args()
-    services = []
-    if args.service:
-        for service in args.service:
-            services.extend(service.split(","))
 
     if args.command == 'query':
         if args.directory:
@@ -153,8 +149,9 @@ def main():
                 pass
             os.chdir(args.directory)
         increase_limit_nofiles()
+        services = args.service or get_services()
         do_query(
-            services or get_services(),
+            services,
             args.region,
             args.operation,
             verbose=args.verbose or 0,