Changed record_id format from "#f-..." to "#rid-..."