                     sub_values.push
                         key: key
                         value: @json_to_node value[key]
-                    #TODO Remove this check by sending whether the comma should be add or not
-                    if typeof value[key] is 'string' and (/^(http|https):\/\/[^\s]+$/i.test(value[key]) or  /^[a-z0-9._-]+@[a-z0-9]+.[a-z0-9._-]{2,4}/i.test(value[key]))
+                    # We don't add a coma for url and emails, because we put it in value (value = url, >>)
+                    if typeof value[key] is 'string' and ((/^(http|https):\/\/[^\s]+$/i.test(value[key]) or /^[a-z0-9._-]+@[a-z0-9]+.[a-z0-9._-]{2,4}/i.test(value[key])))
                         sub_values[sub_values.length-1]['no_comma'] = true
 
                 if sub_values.length isnt 0

            # Save the last query (even incomplete)
            @saved_data.current_query = @codemirror.getValue()

            if event?.which?
                if event.which is 27 # ESC
                    @hide_suggestion_and_description()

                                    to_skip = result_regex[0].length-1
                                    element.next_key = null
                                    element.current_key_start = i+result_regex[0].length
                        # Catch for array
                        else if element.type is 'array'
                            if char of @stop_char.opening
                                stack_stop_char.push char
