Fix escaped validation keys. Closes #1508