Fixes: Don't save <None> shortcuts; Music videos links