Handle filter id's with _s, fixes #2