Rewrite API params for GET & POST
Revert & Fix "Rewrite API params for GET & POST"

This reverts commit 7ce2935df6d80fa8ab556702f480844eefc98efd.