Bugfix + webserver speed improvement settings
Revert "Bugfix + webserver speed improvement settings"

This reverts commit e91a1fd23dfb1b2cc02a02822500b6dacd64cdec.
Revert "Revert "Bugfix + webserver speed improvement settings""

This reverts commit dd51ba4a36f0a3a0fa1600d8b267d92aa8fab4dc.