TMDB keep filename

Hi,

I'm having issue with my Kodi on Android. All my movies are in their respective folders

Star Wars Episode VI - Return of the Jedi
Star Wars Episode VI - Return of the Jedi.mkv

I've changed option in Settings "Keep filenames....." and also under TMDB scaper settings "Replace folder name with library title" or something similar. But after updating movie info, this movie is shown as "Return of the Jedi". Any way to change this to keep names as folder ones?
Tried to Clean my library, manually delete DB files and recreate them but it didn't help. Universal Scraper works somewhat better but not for all movies.

Thank you.