fix message and pmessage handling for subscribe and psubscribe