Moving isset to !empty to grab the correct data