Improve matching for queries with different languages and years#1622

SubJunk wants to merge 2 commits into

mainUniversalMediaServer/api:mainfrom

failed-languageUniversalMediaServer/api:failed-languageCopy head branch name to clipboard