Added filter, fix [] as type