Fix match highlight bug and switch to place_id from deprecated reference