Import task queries tweaked