Closes 183. CourtId highlighting bug fix