Fix target flow of policies; allow '-' properly in chars
Re-org <EOL> tags for improved visual layout