cleanup
query string works