Add some more markup around filter links.  Also updating sanitize func
Merge pull request #3 from borkweb/markup-tweaks

Add some more markup around filter links.  Also updating sanitize func