Fix double escaping in question list
Fix merge error with windows linenendings.... again.....