Handle empty shortened values
Fix shortened variable name to shortned