Minor adjustment to the rewrite rule and a couple additional best practices notes.