added filtering by object