Changed to use only one shortname
Added checks to deal with missing or private lists
Fixed bug
More bug fixes