Optimized option fix for pages. Page mapper improved