Add URI encoding for options