Merged Entity and Speaker, things work better now