urls and links fix. restore events logic