Added es5 query param support