Fix in complication and an optimisation to have only one GetAll
Fix in complication and an optimisation to have only one GetAll

EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery,andreaspada/EDDiscovery