Fixed internal web server to work with new entities