Improve site and build file
Improve secondary keys