Fix the custom selection
Made improvements for the custom option