Sepparated non-redirect & redirect pages map, performance optimizations - redirects map needs testing