Bug fixes for some cloaking rules & redirect 301