Add filtering of Id to avoid 0/false id