diff --git a/video_metadata/views/file_listing.py b/video_metadata/views/file_listing.py
index aa00514..d24593d 100644
--- a/video_metadata/views/file_listing.py
+++ b/video_metadata/views/file_listing.py
@@ -14,11 +14,11 @@ bp = Blueprint('file_listing', __name__, url_prefix='/file_listing')
 
 @dataclass
 class path_entry:
-    base_name = ''
-    rel_path = '' # NOTE: fs path relative to config['MOVIE_DIR']
-    file_extension = ''
-    is_dir = False
-    in_db = False
+    base_name: str = ''
+    rel_path: str = '' # NOTE: fs path relative to config['MOVIE_DIR']
+    file_extension: str = ''
+    is_dir: bool = False
+    in_db: bool = False
 
 
 @bp.route('/folder_contents/')
diff --git a/video_metadata/views/tmdb.py b/video_metadata/views/tmdb.py
index f6295b0..7e55775 100644
--- a/video_metadata/views/tmdb.py
+++ b/video_metadata/views/tmdb.py
@@ -7,7 +7,7 @@ import json
 import re
 from sqlite3 import DatabaseError
 import ssl
-from typing import Dict, List
+from typing import Any, Dict, List
 from urllib.error import URLError, HTTPError
 import urllib.parse
 import urllib.request
@@ -48,30 +48,30 @@ class query_data:
     full_url: str = ''
     movie_year: int = 0
     parsed_query_str: str = ''
-    query_params = {}
+    query_params: str = ''
     query_type: query_type = query_type.UNKNOWN
     raw_query_str: str = ''
     rel_path: str = ''
 
 @dataclass
 class response_data:
-    errors = []
-    parsed_response = {}
-    response_body = ''
-    response_headers = []
-    response_status = 0
-    result_count = 0
+    errors: List[str] = field(default_factory=list)
+    parsed_response: Any = field(default_factory=object)
+    response_body:str = ''
+    response_headers: List[str] = field(default_factory=list)
+    response_status:int = 0
+    result_count:int = 0
 
 @dataclass
 class view_result:
-    id = 0
-    title = ''
-    release_date = 0
-    overview = ''
-    genre_ids = []
-    original_language = ''
-    poster_path = 'no_image.png'
-    tmdb_link = ''
+    id: int = 0
+    title: str = ''
+    release_date: str = ''
+    overview: str = ''
+    genre_ids: List[int] = field(default_factory=list)
+    original_language: str = ''
+    poster_path: str = 'no_image.png'
+    tmdb_link: str = ''
 
 
 ####################
@@ -142,6 +142,9 @@ def query_movie():
 
                 storeTMDBQueryResults(query, view_results)
 
+    errors.extend(query.errors)
+    errors.extend(response.errors)
+
     if errors:
         view_results.clear()
         flash(errors)