More module query changes