Fix fav button regression and do checks for incomplete route data