added limits to queries to avoid subqueries returning > 1 results