fix memorize/queue

@samshull Will not merge this, but want a +1 for the changes. These changes will be made for the newer client on top of master soon.