Added full page view support and more paths cases are handled