Changed options set handling to match unicode option