Removed extra S's; Added more queries