Improving entity_score module [ADS-17]