ISPN-3472 Add all modules required by remote-query