improve some instances where unwanted filters were being added to urls
wrap tags in urls, improve filters