Added support to extract non-delimited string from attributes
Changed extraction without delimiter to not extract delimited string (redundant extraction)