YouTube-query-related hotfix