fixes for init values and deep linking