some fixes
Merge branch 'improve_join' into develop
fix create.html