Fixed to properly escape some stuff