Fixed #16727 -- contenttypes shortcut view error

Including shortcut fix and corresponding tests