reorg integration
add GET querystring + fix some bugs