Change filter labels, closes #21