purge arbitrary queries
rearrange js; remove commas from html (derp)