Removed pre-extract on all result set if "raw" mode used