fix type of post
fix the filling
Merge branch 'data-update' into development
Merge branch 'development-raihan' into development