Added quotes escaping in Mass Storage