Fix #37 and some changes due to twitter restrictions

Add the amount of water to the tweet.
Change the query of data to make the query faster.
Change the assembly of the tweet because twitter refused tweets with the
url due to wrong fraud detection.