use @Filter instead of manually splitting out @Basic