Fix "replies" mapper and client