Instead of extracting options and sortlist we now just dump