Fixed some bugs regarding deep links
