[fix] content flow and general validation