Made services html endpoint more dynamic