Improve param option UX