Added new picture element
Removed unused param escape + Simplified value check