Re-enabled fix that update record placeholders properly