Bug fix and functionality improvement for interception page.