Performance and validation improvements. Also added maxResults that can be shown