Added independent queries for each disk type