fix for safe markup and boolean field