revisit of Oracle error-based payloads (added replace for '@' as a problematic char for XMLType function)