Refactoring to avoid url-encoding and use request params