Increased performance for large dataset

Updated queries by summerise requested data