diff --git a/lib/geocoder/cli.rb b/lib/geocoder/cli.rb
index 0d24ea16378d911a709d412666604d9e7b95d65e..2d885a35f16488266bec6763ecaa1409462bf359 100644
--- a/lib/geocoder/cli.rb
+++ b/lib/geocoder/cli.rb
@@ -64,12 +64,16 @@ module Geocoder
       end
 
       if show_url
-        out << Geocoder.send(:lookup).send(:query_url, query) + "\n"
+        lookup = Geocoder.send(:lookup, query)
+        reverse = lookup.send(:coordinates?, query)
+        out << lookup.send(:query_url, query, reverse) + "\n"
         exit 0
       end
 
       if show_json
-        out << Geocoder.send(:lookup).send(:fetch_raw_data, query) + "\n"
+        lookup = Geocoder.send(:lookup, query)
+        reverse = lookup.send(:coordinates?, query)
+        out << lookup.send(:fetch_raw_data, query, reverse) + "\n"
         exit 0
       end