Merge branch 'feature/struct' into develop
merge head to develop though it is not complete
change header.html
Changed the query name to fit the db