Add option to retrieve the text from raw layer.
Add option to retrieve the text from raw layer FIXED