Improve options reporting