feature update to support expand in options