further fixes to filter code, tagging now works as expected