Add proper dependencies for remote query module