Improved upscale/stretch options handling