Added sorting to highway queries
Moved more settings into apisettings.properties
Chanaged database loader