diff --git a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java
index 2d6cd8a..0ab4356 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java
@@ -31,8 +31,8 @@ public class FavoriteProviderHelper {
 
     public boolean isFavorite(Movie movie) {
         String[] projection = {FavoriteColumns._ID};
-        String selection = FavoriteColumns.TITLE + "=?";
-        String[] selectionArgs = new String[]{movie.getTitle()};
+        String selection = FavoriteColumns._ID + "=?";
+        String[] selectionArgs = new String[]{String.valueOf(movie.getId())};
         Cursor cursor = mResolver.query(FavoriteProvider.Favorites.FAVORITES_URI, projection, selection, selectionArgs, null);
         boolean isFavourite = (cursor != null && cursor.getCount() > 0);
         if(cursor != null)
diff --git a/app/src/main/java/net/headlezz/udacityproject1/moviedetails/MovieDetailsFragment.java b/app/src/main/java/net/headlezz/udacityproject1/moviedetails/MovieDetailsFragment.java
index bdb00e4..f1b0f9c 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/moviedetails/MovieDetailsFragment.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/moviedetails/MovieDetailsFragment.java
@@ -126,13 +126,14 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
             mVideoList = response.body();
             if(getActivity() != null)
                 showVideoList(mVideoList);
+        } else {
+            trailerHolder.getChildAt(0).setVisibility(View.VISIBLE);
         }
     }
 
     @Override
     public void onFailure(Throwable t) {
-        if(getActivity() != null)
-            Toast.makeText(getActivity(), "Failed to load videos: " + t.getMessage(), Toast.LENGTH_SHORT).show();
+        trailerHolder.getChildAt(0).setVisibility(View.VISIBLE);
     }
 
     @OnClick(R.id.movie_details_btReviews)
@@ -173,6 +174,7 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
     private void showVideoList(@NonNull VideoList videoList) {
         List<Video> videos = videoList.getVideos();
         if(videos.size() > 0) {
+            trailerHolder.getChildAt(0).setVisibility(View.GONE);
             for (Video video : videoList.getVideos()) {
                 View view = LayoutInflater.from(getActivity()).inflate(R.layout.movie_details_trailer_item, trailerHolder, false);
                 TextView tv = (TextView) view.findViewById(R.id.trailer_item_tvName);
diff --git a/app/src/main/res/layout/fragment_movie_details.xml b/app/src/main/res/layout/fragment_movie_details.xml
index a2bebe3..5e0ef64 100644
--- a/app/src/main/res/layout/fragment_movie_details.xml
+++ b/app/src/main/res/layout/fragment_movie_details.xml
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
-            </LinearLayout>
+        </LinearLayout>
 
         <Button
             style="@style/Widget.AppCompat.Button.Colored"