added more options
if fields is not a list convert it to