Some improvements to truck stop matcher to hopefully handle morning stops better