fixed query + home manager