Basic filtering working (fixed cloud update for non structured cloud)