Fix thumbnails loading
(all main requirements from the task completed)