Pooja: fixed validation on UI: on DB not done