Bug fixes in content router for enabling Advanced option