Fixed empty datasource being part of the list