Revert "Revert "Features/short list""

Reverts SCPR/SCPRv4#218