more cleanup, replacing of explicit links with filter tags