Improved a little json formatting and replaced QueryParameters by Query