Refactored the httpresponder, added links and query data