Fix/1005/slow species list