More capitalization of 'url' and extra checks on notifs