added object type check to filter