ENSEMBL-3209 performance improvements