DAR-2501 More text() to plain() changes