adding support for deep linking and history mgmt