Code Changes for deep linking post processing