Added limits to queries made