Add web components
Reformat bad query strings