Fixed issues with favorites navigation