Issue #2156923 by amateescu, jayeshanandani, miraj9093, Xano, InternetDevels: Various code cleanups for the new shortcut entity.