Fix restaurant rr bugs.