Simplified zoom handling
Don't set tms option, since we handle it in this class anyway.
Merge branch 'tms-fix'