#64: Unify all Filterable types