Add orderBy
Add filter flag to not escape quotes