Fix types and use of results list