+ encode non escaped stuff too