Fix verification issue, area dropdown issue