fixes #2549, #2197, #2544 - new host and organizations and locations