fixed issue when service crashs when navigating directly to the edit view
updated TODO comment
updated html5 lib to 2.1.1