Receiver ids and keys parsing fix