fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more