Move desktop into own query