diff --git a/src/Controller/TYPProfileController.php b/src/Controller/TYPProfileController.php
--- a/src/Controller/TYPProfileController.php
+++ b/src/Controller/TYPProfileController.php
@@ -1,154 +1,166 @@
 <?php
 
 /**
  * @file
  * Contains \Drupal\page_example\Controller\TableSortExampleController.
  */
 /**/
 namespace Drupal\typ_profile\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Drupal\Core\Database\Query;
 use Drupal\Core\Url;
 /**
  * Controller routines for tablesort example routes.
  */
 class TYPProfileController extends ControllerBase
 {	
 	/*public function profile_redirect(){
         return $this->redirect("<front>");
 	}*/
 
 
     public function formatPhoneNumber($s) {
         foreach( explode(",", $s) as $p) {
             $num_com = null;
             $num_first = null;
             $num_second = null;
             $num_ex = explode("-", trim($p));
             for($i = 0; $i < count($num_ex); $i++) {
                 if(($i+1) < count($num_ex)) {
                     $num_first .= $num_ex[$i];
                 } else {
                     $num_second .= $num_ex[$i];
                 }
             }
             if(empty($num_first)) {
                 $num_first = $num_second;
                 $num_second = null;
             }
             if(strlen($num_first) == 9) {
                 $num_com = substr($num_first, 0, 1) . '-'. substr($num_first, 1, 4). '-'. substr($num_first, 5,4);
                 if(!empty($num_second)) {
                     $num_com .= '-'.$num_second;
                 }
             } else {
                 if(strlen($num_first) < 9) {
                     $num_first .= $num_second;
                     if(strlen($num_first) == 9) {
                         $num_com = substr($num_first, 0, 1) . '-'. substr($num_first, 1, 4). '-'. substr($num_first, 5,4);
                     } elseif(strlen($num_first) == 10){
                         $num_com = substr($num_first, 0, 2) . '-'. substr($num_first, 2, 4). '-'. substr($num_first, 6,7);
                     }else {
                         $num_com = substr($num_first, 0, 1) . '-'. substr($num_first, 1, 4). '-'. substr($num_first, 5,4).'-'.substr($num_first, 9,strlen($num_first));                 
                     }
                 } else {
                     if(strlen($num_first) == 10) {
                         $num_com = substr($num_first, 0, 2) . '-'. substr($num_first, 2, 4). '-'. substr($num_first, 6,7);
                     } else {
                         $num_first .= $num_second;
                         $num_com = substr($num_first, 0, 1) . '-'. substr($num_first, 1, 4). '-'. substr($num_first, 5,4).'-'.substr($num_first, 9,strlen($num_first));
                     }
                 }
             }
             $ps[] = $num_com;
         }
         return implode(", ", $ps);
     }
 
 
     public function formatWorkingHour($s) {
         foreach( explode(",", $s) as $p) {
             $ps[] = $p;
         }
         return implode(", ", $ps);
     }
     protected $data;
     public function profileTitle($bizid) {
         
         $this->data = \Drupal::service("typ.search")->getProfile($bizid ,AUTO);
         if (!$this->data) return '';
         else return $this->data['humanname'];
     }
 	public function profilePage($bizid){
-
         $this->data = \Drupal::service("typ.search")->getProfile($bizid ,AUTO);
         $address_id = "";
         $language = \Drupal::languageManager()->getCurrentLanguage()->getId();
         $data = $this->data;
         if (!$data) {
             return $this->redirect("<front>");
         }
         /*if($data['landingpage'] == ""){
             $address_id = $data['addressid'];
         }
         if(is_numeric($address_id)){
             $result = \Drupal::service('typ.unvservice')->loadListing($data['customerid']);
             $rs_details = (!empty($result['address'][$data['headingcod']][$address_id]['frontviews']))?$result['address'][$headingcode][$data['headingcod']]['frontviews']:array();
         } else {
             $result = \Drupal::service('typ.unvservice')->loadService($data['customerid']);
         }*/
         $address_id = $data['addressid'];
         $result = \Drupal::service('typ.unvservice')->loadService($data['customerid']);
         //(!empty($result['landingpages'][$data['headingcode']]))?$result['landingpages'][$data['headingcode']]:array();
         //$type = '';
         if($result['customertype'] == 'FL'){
             $type = 'FL';
         }else{
             $result_olc = \Drupal::service('typ.catalog')->listData($data['customerid']);
         }
 
-
         $pos = strpos(html_entity_decode($data['proddesc']),"<p>");
         if($pos !== false){
             $tempdesc = substr(html_entity_decode(html_entity_decode($data['proddesc']),3));
         }else{
             $tempdesc = html_entity_decode(html_entity_decode($data['proddesc'])) ;
             //$tempdesc = $data['proddesc'];
         }
         $temp = '<p style="color:#000;">';
         $tempdesc = $temp.$tempdesc;
         $type = $data['customertyp'];
 
         if($type == "FL") {
             $dataproddesct = iconv_substr($tempdesc,0,123,"UTF-8");
             $dataproddesct .= '...';
         }else{
             $dataproddesct = $tempdesc;
         }
         if($type != "FL" && !empty($result_olc)){
             $olcdata = $result_olc[0];
         }
         if (!empty($data['telno'])) {
             foreach ($data['telno'] as $t) {
                 $data['_format']['telno'][] = $this->formatPhoneNumber($t);
             }
         }
         if (!empty($data['fax'])) {
             foreach ($data['fax'] as $t) {
                 $data['_format']['fax'][] = $this->formatPhoneNumber($t);
             }
         }
+
+        if($type == "FL"){
+            unset($data['_format']['telno']);
+            $data['_format']['telno'][] = $data['_format']['telno'][0];
+            unset($data['fax']);
+            $data['fax'][] =  $data['fax'][0];
+            $exp = explode(",", $data['email']);
+            unset($data['email']);
+            $data['email'][] = $exp[0];
+        }else{
+            $exp = explode(",", $data['email']);
+            $data['email'] = $exp;
+        }
+
         if (!empty($data['workinghours'])) $data['_format']['workinghours'] = $this->formatWorkingHour($data['workinghours']);
-        
+
         $display[] = array(
             '#theme' => 'typ_profile',
             '#profile' => $data,
             '#prodescription' => $dataproddesct,
             '#catalog' => $olcdata,
             '#type' => $type
             );
         return $display;
 	}
 }
\ No newline at end of file
diff --git a/templates/typ-profile.html.twig b/templates/typ-profile.html.twig
--- a/templates/typ-profile.html.twig
+++ b/templates/typ-profile.html.twig
@@ -1,276 +1,279 @@
 {% set base_images = 'http://media.yellowpages.co.th/yellowpages'%}
 <div class="container-fluid">
     <div class="col-xs-12 col-md-8 col-lg-8" >
 
         <div class="row">
             <div class="col-xs-12 col-md-12 col-lg-12">
                 {% if profile.logo %}
                 <div class="col-xs-12 col-md-5 col-lg-5">
                     <img class="img-responsive" src="{% if not profile.logo %} {{ nopic }}
                          {% else %} {{ [base_images,"/logo/",profile.logo]|join }} {% endif %}"/>
                 </div>
                 {% endif %}
                 <div class="col-xs-12 col-md-7 col-lg-7">
                     <h4>{{ profile.humanname|raw }}</h4>
                     หมวดหมู่ : <a href="/heading/{{ profile.ypheadingname }}">{{ profile.headingname|raw }}</a><br>
                 </div>
             </div>
         </div>
 
         <div class="row">
             <br>
             <div class="col-xs-12 col-sm-12 col-lg-12">
                 {% trans %} Address {% endtrans %}
                 {% if profile.location.lat %}
                     <a href="/ypsearch?qm=#{{ profile.humanname|raw }}"><img src="/themes/bootstrap/typ/images/icon-map/icon-pin-map_r.png"></a> <br>
                 {% else %}
                     <a href="https://www.google.co.th/maps/search/{{ profile.fulladdr|url_encode     }}" target="_blank"><img src="/themes/bootstrap/typ/images/icon-map/icon-pin-map_r.png"></a> <br>
                 {% endif %}
                 {{ [profile.addr,profile.soi,profile.road,profile.subdistrictname,
                     profile.districtname,profile.cityname,profile.postcode]|join(' ') }}
                 <br><br>
 
                 <div class="row">
                     <div class="col-xs-4 col-sm-3 col-lg-3 ">
                         {% if not profile.telno %}{% else %}{% trans %} Tel {% endtrans %}<br>{% endif %}
                         {% if not profile.fax %}{% else %}{% trans %} Fax {% endtrans %}<br>{% endif %}
                         {% if not profile.email %}{% else %}{% trans %} Email {% endtrans %} <br>{% endif %}
                         {% if not profile.websit %}{% else %}{% trans %} Website {% endtrans %} <br>{% endif %}
                         {% if not profile.workinghours %}{% else %}{% trans %} Work-Time {% endtrans %}{% endif %}
                     </div>
                     <div class="col-xs-8 col-sm-9 col-lg-9">
                         {% if not profile.telno %}
                             {% else %}
                                 {% if type == 'FL' %}
                                     <span>{{ profile.telno.0 }}</span><br>
                                 {% else %}
                                 {% for key, tel in profile._format.telno %}
                                     {% if loop.last != key+1 %}<a href="tel:{{ tel }}">{{ tel }}</a>{{ " ," }}
                                     {% else %}<a href="tel:{{ tel }}">{{ tel }}</a>{% endif %}
                                 {% endfor %}<br>
                                 {% endif %}
                         {% endif %}
 
                         {% if not profile.fax %}
                         {% else %}
                             {% if type == 'FL' %}
                                 <span>{{ profile._format.fax.0 }}</span><br>
                             {% else %}
                                 {% for key, fax in profile._format.fax %}
                                     {% if loop.last != key+1 %}<a href="tel:{{ fax }}">{{ fax }}</a>{{ " ," }}
                                     {% else %}<a href="tel:{{ fax }}">{{ fax }}</a>{% endif %}
                                 {% endfor %}<br>
                             {% endif %}
                         {% endif %}
 
                         {% if not profile.email %}
                         {% else %}
                             {% if type == 'FL' %}
                                 <span>{{ profile.email }}</span><br>
                             {% else %}
                                 {% set email =  profile.email|split(',') %}
                                 {% for key , mail in email %}
                                     {% if loop.last != key+1 %}<a href="mailto:{{ mail }}">{{ mail }}</a> ,
                                     {% else %}<a href="mailto:{{ mail }}">{{ mail }}</a><br>{% endif %}
                                 {% endfor %}
                             {% endif %}
                         {% endif %}
 
                         {% if not profile.websit %}
                             {% else %}
                             {% set website =  profile.websit|split(',') %}
                                 {% for key , web in website %}
                                     {% if loop.last != key+1 %}<a href="http://{{ web }}" target="_blank">{{ web }}</a> ,
                                     {% else %}<a href="http://{{ web }}" target="_blank">{{ web }}</a><br>{% endif %}
                                 {% endfor %}
                         {% endif %}
 
                         {% if not profile.workinghours %}
                             {% else %}
                             {{ profile._format.workinghours }}<br>
                         {% endif %}
                     </div>
+
+
+
                     <div class="row" style="margin-left: 0px;">
                         <div class="col-xs-12 col-md-12 col-lg-12">
                             {% if not prodescription %}
                                 {% else %}
                                     <br>{% trans %} Product And Service {% endtrans %}<br><br>
                                     {{ prodescription|raw }}<br>
                             {% endif %}
 
                             {% if not profile.brandname %}
                                 {% else %}<br>{% trans %} Banner {% endtrans %} : {{ profile.brandname|replace({"<p>":" ","</p>":" "}) }}
                             {% endif %}
                             <br><br><br>
                             {# TAB #}
                             {% if type == 'FL' %}{% else %}
                             <div class="mobile">
                             <ul class="nav nav-tabs">
                                 {% if profile.picturet1 %}<li class="active"><a data-toggle="tab" href="#home">{% trans %} Picture {% endtrans %}</a></li>{% endif %}
                                 {% if profile.location.lat %}<li {% if not profile.picturet1 %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu1">{% trans %} Digital Map {% endtrans %}</a></li>{% endif %}
                                 {% if profile.printadst %}<li {% if not profile.picturet1 and not profile.location.lat %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu2">{% trans %} Advertisement {% endtrans %}</a></li>{% endif %}
                                 {% if profile.promotion %}<li {% if not profile.picturet1 and not profile.location.lat and not profile.printadst %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu3">{% trans %} Promotion  {% endtrans %}</a></li>{% endif %}
                                 {% if profile.map %}<li {% if not profile.picturet1 and not profile.location.lat and not profile.printadst and not profile.promotion %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu4">{% trans %} Map Picture {% endtrans %}</a></li>{% endif %}
                             </ul>
 
                             <div class="tab-content">
                                 {% if profile.picturet1 %}
                                 <div id="home" class="tab-pane fade in active">
                                     <br>
                                     <div class="row">
                                         {% if profile.picturet1  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet1]|join}}" class="colorbox">
                                                     <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet1]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet2  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet2]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet2]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet3  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet3]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet3]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet4  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet4]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet4]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet5  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet5]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet5]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet6  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet6]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet6]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet7  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet7]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet7]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet8  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet8]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet8]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet9  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet9]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet9]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                     </div>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.location.lat %}
                                 <div id="menu1" {% if  profile.picturet1 %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <br>
                                     <iframe width="100%" height="240" scrolling="no" frameborder="0" src="http://landingpage.yellowpages.co.th/yp_map.php?latitude={{ profile.location.lat }}&amp;longitude={{ profile.location.lon }}&amp;height=240&amp;width=445" allowtransparency="true" marginwidth="0" marginheight="0"></iframe>
                                 </div>
                                 {% endif %}
                                 
                                 {% if profile.printadst %}
                                 <div id="menu2" {% if  profile.picturet1 or profile.location.lat %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <div class="row">
                                         <div class="col-xs-12 col-sm-12 col-lg-12">
                                             <br>
                                             <a href="{{[base_images,"/printads/th/",profile.printadst,".jpg"]|join}}" class="colorbox">
                                                 <img class="img-responsive typ-profile-printads" src="{{[base_images,"/printads/th/",profile.printadst,".jpg"]|join}}"/>
                                             </a>
                                         </div>
                                     </div>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.promotion %}
                                 <div id="menu3" {% if  profile.picturet1 or profile.location.lat or profile.printadst %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <br>
                                    <p class="text-center" style="color:#000">{{ profile.promotion }}</p>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.map %}
                                     <div id="menu4" {% if  profile.picturet1 or profile.location.lat or profile.printadst or profile.map %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                         <div class="row">
                                             <div class="col-xs-12 col-sm-12 col-lg-12">
                                                 <br>
                                                 <a href="{{[base_images,"/printads/th/",profile.printads,".jpg"]|join}}" class="colorbox">
                                                     <img class="img-responsive " src="{{[base_images,"/map/th/",profile.map,".jpg"]|join}}"/>
                                                 </a>
                                             </div>
                                         </div>
                                     </div>
                                 {% endif %}
                             </div>
                             </div>
 
                             {% endif %}
 
                             {#<br><br><br>#}
                             {#{% if not profile.custname %}#}
                                 {#{% else %}#}
                                 {#{{ profile.custname|raw }} : แสดงความคิดเห็น#}
                             {#{% endif %}#}
                             {#<br><br>#}
 
                             {# TAB #}
                             {#<div class="mobile">#}
                                 {#<ul class="nav nav-tabs">#}
                                     {#<li class="active"><a data-toggle="tab" href="#menu">{% trans %} Comment {% endtrans %}</a></li>#}
                                     {#<li><a data-toggle="tab" href="#menu">{% trans %} Picture Concerned {% endtrans %}</a></li>#}
                                     {#&#123;&#35;<li><a data-toggle="tab" href="#menu6">{% trans %} Advertise {% endtrans %}</a></li>&#35;&#125;#}
                                 {#</ul>#}
 
                                 {#<div class="tab-content">#}
                                     {#<div id="menu4" class="tab-pane fade in active">#}
                                         {#<h3>HOME</h3>#}
                                         {#<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>#}
                                     {#</div>#}
                                     {#<div id="menu5" class="tab-pane fade">#}
                                         {#<h3>Menu 1</h3>#}
                                         {#<p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>#}
                                     {#</div>#}
                                     {#&#123;&#35;<div id="menu6" class="tab-pane fade">&#35;&#125;#}
                                         {#&#123;&#35;<h3>Menu 2</h3>&#35;&#125;#}
                                         {#&#123;&#35;<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.</p>&#35;&#125;#}
                                     {#&#123;&#35;</div>&#35;&#125;#}
                                 {#</div>#}
                             {#</div>#}
                             {# END TAB #}
                             <br><br>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="col-xs-12 col-md-4 col-lg-4">
         <div class="col-xs-12 col-md-12 col-lg-12">
 
         </div>
     </div>
 </div>