diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py
index 5413c0fc..85047e9a 100644
--- a/couchpotato/core/media/_base/media/main.py
+++ b/couchpotato/core/media/_base/media/main.py
@@ -125,7 +125,7 @@ class MediaPlugin(MediaBase):
         imdb_id = getImdb(str(media_id))
 
         if imdb_id:
-            m = db.get('media', imdb_id, with_doc = True)['doc']
+            m = db.get('media', 'imdb-%s' % imdb_id, with_doc = True)['doc']
         else:
             m = db.get('id', media_id)
 
diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py
index b2234cfc..d8060d71 100644
--- a/couchpotato/core/media/movie/_base/main.py
+++ b/couchpotato/core/media/movie/_base/main.py
@@ -101,7 +101,9 @@ class MovieBase(MovieTypeBase):
                 '_t': 'media',
                 'type': 'movie',
                 'title': def_title,
-                'identifier': params.get('identifier'),
+                'identifiers': {
+                    'imdb': params.get('identifier')
+                },
                 'status': status if status else 'active',
                 'profile_id': params.get('profile_id', default_profile.get('_id')),
                 'category_id': cat_id if cat_id is not None and len(cat_id) > 0 and cat_id != '-1' else None,
@@ -116,7 +118,7 @@ class MovieBase(MovieTypeBase):
 
             new = False
             try:
-                m = db.get('media', params.get('identifier'), with_doc = True)['doc']
+                m = db.get('media', 'imdb-%s' % params.get('identifier'), with_doc = True)['doc']
             except:
                 new = True
                 m = db.insert(media)
@@ -262,7 +264,7 @@ class MovieBase(MovieTypeBase):
             if media_id:
                 media = db.get('id', media_id)
             else:
-                media = db.get('media', identifier, with_doc = True)['doc']
+                media = db.get('media', 'imdb-%s' % identifier, with_doc = True)['doc']
 
             info = fireEvent('movie.info', merge = True, extended = extended, identifier = media.get('identifier'))
 
diff --git a/couchpotato/core/media/movie/providers/info/_modifier.py b/couchpotato/core/media/movie/providers/info/_modifier.py
index d9a15e8c..131cc058 100644
--- a/couchpotato/core/media/movie/providers/info/_modifier.py
+++ b/couchpotato/core/media/movie/providers/info/_modifier.py
@@ -95,7 +95,7 @@ class MovieResultModifier(Plugin):
 
             media = None
             try:
-                media = db.get('media', imdb, with_doc = True)['doc']
+                media = db.get('media', 'imdb-%s' % imdb, with_doc = True)['doc']
             except RecordNotFound:
                 pass
 
diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py
index b749ee61..40475a4d 100644
--- a/couchpotato/core/plugins/release/main.py
+++ b/couchpotato/core/plugins/release/main.py
@@ -92,7 +92,7 @@ class Release(Plugin):
 
             # Add movie if it doesn't exist
             try:
-                media = db.get('media', group['identifier'], with_doc = True)['doc']
+                media = db.get('media', 'imdb-%s' % group['identifier'], with_doc = True)['doc']
             except:
                 media = fireEvent('movie.add', params = {
                     'identifier': group['identifier'],