fix query modules