fixing issue with body and query parameters