Dont allow to set unsupported output format
Minor improvments acording to CS
test