several improvements on Jsoup utilization
fix on the if then else
Merge branch 'thomas'