Hopefully fixed so that type is filterable