Handle request parameters better