Query module developed
Fixed some conflicts