updated the basic queries