- added more blocks definition
- fixed url decoding