Adding fix for search, using view.getEntryByKey instead of ViewNavigator