Revert "Revert "Alert removed""

This reverts commit 28b2738ed9bc6ac55c7bead566370b2054ac7e0f.
Revert "Generic placeholders inserted"

This reverts commit 9a421a61fadc69c284a6d0f9489920f9316f795c.