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