Fixing query see BT#7311
Fixing download file list see #7311