Added more option to Q2

and format jsTasks