Additional slug and router fix for CMS plugin
Minor lib fixes