Add shortcut when data file exists for listings, fix URL null reference