Override 'single' with limit in Query.
General fixes and improvements.