diff --git a/main.py b/main.py
index 1ab4864..f6a3017 100644
--- a/main.py
+++ b/main.py
@@ -130,8 +130,8 @@ def application(env, re):
 
  elif rtype.lower() in ["closest", "close", "near", "nearby"]:
   try:
-   lat = float(args["lat"][0])
-   lon = float(args["lon"][0])
+   lat = float(args["lat"][0].replace(",", "."))
+   lon = float(args["lon"][0].replace(",", "."))
 
    if (not lat and not lat == float(0)) or (not lon and not lon == float(0)):
     raise ValueError()
diff --git a/workers/conn.py b/workers/conn.py
index 1d82573..52edcc5 100644
--- a/workers/conn.py
+++ b/workers/conn.py
@@ -135,7 +135,7 @@ def worker(frm, to, count = 3, time = datetime.datetime.now(pytz.timezone("Europ
  """
 
  for i in range(len(conns)):
-  output += (conns[i].xml(1) + "\n") if not json else (conns[i].json(2) + ("\n" if i == len(conns) - 1 else ",\n"))
+  output += (conns[i].xml(1, i) + "\n") if not json else (conns[i].json(2, i) + ("\n" if i == len(conns) - 1 else ",\n"))
 
  output += "</connections>" if not json else " ]\n}"