fix DB and review logic
add current set
fix form