diff --git a/resources/views/web/bukjalar.blade.php b/resources/views/web/bukjalar.blade.php
index 11d8ad8a..63ec4422 100644
--- a/resources/views/web/bukjalar.blade.php
+++ b/resources/views/web/bukjalar.blade.php
@@ -69,8 +69,93 @@
                                         </div>
                                         <div class="for-scroll-box">
                                             @foreach($folders as $folder)
-                                                @if(str_contains($folder->title, $folder->type))
-                                                    @if($folder->property->filter_value == 1)
+                                                @if($folder->property->filter_value == 1)
+                                                    <div class="bukja-table @if($folder->on_tv != false) on_tv @endif
+                                                    @if($folder->on_radio != false) on_radio @endif
+                                                    @if($folder->on_subtitle != false) on_subtitle @endif
+                                                    @if($folder->on_web != false) on_web @endif
+                                                    @if($folder->on_belet != false) on_belet @endif">
+                                                        @if(isset($folder->total_price) & $folder->total_price !== '')
+                                                            @php
+                                                                $k=0
+                                                            @endphp
+                                                            <div class="row">
+                                                                <div class="col-md-12 col-xs-12"  style="padding:0">
+                                                                    <h4 class="text-center folder_title" style="background: {{ $folder->property->color }}">
+                                                                        <b>{{$folder->title}}</b>
+                                                                    </h4>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-md-12 col-xs-12 for-border-box"  style="padding:0">
+                                                                    <div>
+                                                                        <p>{!! $folder->description !!}</p>
+                                                                    </div>
+                                                                    <table class="table table-striped">
+                                                                        <thead>
+                                                                            <tr>
+                                                                                <th scope="col">Wagt aralygy</th>
+                                                                                @if($folder->on_tv)
+                                                                                    <th scope="col">TV</th>
+                                                                                @endif
+                                                                                @if($folder->on_radio)
+                                                                                    <th scope="col">Radio</th>
+                                                                                @endif
+                                                                                @if($folder->on_subtitle)
+                                                                                    <th scope="col">Subtitle</th>
+                                                                                @endif
+                                                                                @if($folder->on_web)
+                                                                                    <th scope="col">Web</th>
+                                                                                @endif
+                                                                                @if($folder->on_belet)
+                                                                                    <th scope="col">Belet</th>
+                                                                                @endif
+                                                                            </tr>
+                                                                        </thead>
+                                                                        <tbody>
+                                                                        @isset($folder->folder_table)
+                                                                            @foreach($folder->folder_table as $table)
+                                                                                <tr>
+                                                                                    
+                                                                                    <td>@isset($table['time'])  {{$table['time']}} @endisset</td>
+                                                                                    @if($folder->on_tv)
+                                                                                        <td>@isset($table['set_tv'])  {{$table['set_tv']}} @endisset</td>
+                                                                                    @endif
+                                                                                    @if($folder->on_radio)
+                                                                                        <td>@isset($table['set_radio'])  {{$table['set_radio']}}@endisset</td>
+                                                                                    @endif
+                                                                                    @if($folder->on_subtitle)
+                                                                                        <td>@isset($table['set_sub'])  {{$table['set_sub']}} @endisset</td>
+                                                                                    @endif
+                                                                                    @if($folder->on_web)
+                                                                                        <td>@isset($table['set_web'])  {{$table['set_web']}} @endisset</td>
+                                                                                    @endif
+                                                                                    @if($folder->on_belet)
+                                                                                        <td>@isset($table['set_belet'])  {{$table['set_belet']}} @endisset</td>
+                                                                                    @endif
+                                                                                </tr>
+                                                                            @endforeach
+                                                                        @endisset
+                                                                        </tbody>
+                                                                    </table>
+                                                                </div>
+                                                            </div>
+                                                        @endif
+                                                    </div>
+                                                @endif
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                @endif
+                                @if($prop->filter_value==2)
+                                        <div role="tabpanel" class="tab-pane fade {{ ($prop->filter_value==1) ? 'in active' : ''}}" id="Section{{$prop->filter_value}}">
+                                            <h3 class="m-t-c">{{$prop->title}}</h3>
+                                            <div class="prop-desc">
+                                                <p>{!! $prop->description !!}</p>
+                                            </div>
+                                            <div class="for-scroll-box">
+                                                @foreach($folders as $folder)
+                                                    @if($folder->property->filter_value ==2)
                                                         <div class="bukja-table @if($folder->on_tv != false) on_tv @endif
                                                         @if($folder->on_radio != false) on_radio @endif
                                                         @if($folder->on_subtitle != false) on_subtitle @endif
@@ -82,7 +167,7 @@
                                                                 @endphp
                                                                 <div class="row">
                                                                     <div class="col-md-12 col-xs-12"  style="padding:0">
-                                                                        <h4 class="text-center folder_title" style="background: {{ $folder->property->color }}">
+                                                                        <h4 class="text-center folder_title" style="border-bottom: 1px solid slategray; color:#fff; background-color: {{ $folder->property->color }}; padding: 4px 0px;">
                                                                             <b>{{$folder->title}}</b>
                                                                         </h4>
                                                                     </div>
@@ -94,30 +179,29 @@
                                                                         </div>
                                                                         <table class="table table-striped">
                                                                             <thead>
-                                                                                <tr>
-                                                                                    <th scope="col">Wagt aralygy</th>
-                                                                                    @if($folder->on_tv)
-                                                                                        <th scope="col">TV</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_radio)
-                                                                                        <th scope="col">Radio</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_subtitle)
-                                                                                        <th scope="col">Subtitle</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_web)
-                                                                                        <th scope="col">Web</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_belet)
-                                                                                        <th scope="col">Belet</th>
-                                                                                    @endif
-                                                                                </tr>
+                                                                            <tr>
+                                                                                <th scope="col">Wagt aralygy</th>
+                                                                                @if($folder->on_tv)
+                                                                                    <th scope="col">TV</th>
+                                                                                @endif
+                                                                                @if($folder->on_radio)
+                                                                                    <th scope="col">Radio</th>
+                                                                                @endif
+                                                                                @if($folder->on_subtitle)
+                                                                                    <th scope="col">Subtitle</th>
+                                                                                @endif
+                                                                                @if($folder->on_web)
+                                                                                    <th scope="col">Web</th>
+                                                                                @endif
+                                                                                @if($folder->on_belet)
+                                                                                    <th scope="col">Belet</th>
+                                                                                @endif
+                                                                            </tr>
                                                                             </thead>
                                                                             <tbody>
                                                                             @isset($folder->folder_table)
                                                                                 @foreach($folder->folder_table as $table)
                                                                                     <tr>
-                                                                                        
                                                                                         <td>@isset($table['time'])  {{$table['time']}} @endisset</td>
                                                                                         @if($folder->on_tv)
                                                                                             <td>@isset($table['set_tv'])  {{$table['set_tv']}} @endisset</td>
@@ -144,94 +228,6 @@
                                                             @endif
                                                         </div>
                                                     @endif
-                                                @endif
-                                            @endforeach
-                                        </div>
-                                    </div>
-                                @endif
-                                @if($prop->filter_value==2)
-                                        <div role="tabpanel" class="tab-pane fade {{ ($prop->filter_value==1) ? 'in active' : ''}}" id="Section{{$prop->filter_value}}">
-                                            <h3 class="m-t-c">{{$prop->title}}</h3>
-                                            <div class="prop-desc">
-                                                <p>{!! $prop->description !!}</p>
-                                            </div>
-                                            <div class="for-scroll-box">
-                                                @foreach($folders as $folder)
-                                                    @if(str_contains($folder->title, $folder->type))
-                                                        @if($folder->property->filter_value ==2)
-                                                            <div class="bukja-table @if($folder->on_tv != false) on_tv @endif
-                                                            @if($folder->on_radio != false) on_radio @endif
-                                                            @if($folder->on_subtitle != false) on_subtitle @endif
-                                                            @if($folder->on_web != false) on_web @endif
-                                                            @if($folder->on_belet != false) on_belet @endif">
-                                                                @if(isset($folder->total_price) & $folder->total_price !== '')
-                                                                    @php
-                                                                        $k=0
-                                                                    @endphp
-                                                                    <div class="row">
-                                                                        <div class="col-md-12 col-xs-12"  style="padding:0">
-                                                                            <h4 class="text-center folder_title" style="border-bottom: 1px solid slategray; color:#fff; background-color: {{ $folder->property->color }}; padding: 4px 0px;">
-                                                                                <b>{{$folder->title}}</b>
-                                                                            </h4>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="row">
-                                                                        <div class="col-md-12 col-xs-12 for-border-box"  style="padding:0">
-                                                                            <div>
-                                                                                <p>{!! $folder->description !!}</p>
-                                                                            </div>
-                                                                            <table class="table table-striped">
-                                                                                <thead>
-                                                                                <tr>
-                                                                                    <th scope="col">Wagt aralygy</th>
-                                                                                    @if($folder->on_tv)
-                                                                                        <th scope="col">TV</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_radio)
-                                                                                        <th scope="col">Radio</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_subtitle)
-                                                                                        <th scope="col">Subtitle</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_web)
-                                                                                        <th scope="col">Web</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_belet)
-                                                                                        <th scope="col">Belet</th>
-                                                                                    @endif
-                                                                                </tr>
-                                                                                </thead>
-                                                                                <tbody>
-                                                                                @isset($folder->folder_table)
-                                                                                    @foreach($folder->folder_table as $table)
-                                                                                        <tr>
-                                                                                            <td>@isset($table['time'])  {{$table['time']}} @endisset</td>
-                                                                                            @if($folder->on_tv)
-                                                                                                <td>@isset($table['set_tv'])  {{$table['set_tv']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_radio)
-                                                                                                <td>@isset($table['set_radio'])  {{$table['set_radio']}}@endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_subtitle)
-                                                                                                <td>@isset($table['set_sub'])  {{$table['set_sub']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_web)
-                                                                                                <td>@isset($table['set_web'])  {{$table['set_web']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_belet)
-                                                                                                <td>@isset($table['set_belet'])  {{$table['set_belet']}} @endisset</td>
-                                                                                            @endif
-                                                                                        </tr>
-                                                                                    @endforeach
-                                                                                @endisset
-                                                                                </tbody>
-                                                                            </table>
-                                                                        </div>
-                                                                    </div>
-                                                                @endif
-                                                            </div>
-                                                        @endif
-                                                    @endif
                                                 @endforeach
                                             </div>
                                         </div>
@@ -244,80 +240,78 @@
                                             </div>
                                             <div class="for-scroll-box">
                                                 @foreach($folders as $folder)
-                                                    @if(str_contains($folder->title, $folder->type))
-                                                        @if($folder->property->filter_value == 3)
-                                                            <div class="bukja-table @if($folder->on_tv != false) on_tv @endif
-                                                            @if($folder->on_radio != false) on_radio @endif
-                                                            @if($folder->on_subtitle != false) on_subtitle @endif
-                                                            @if($folder->on_web != false) on_web @endif
-                                                            @if($folder->on_belet != false) on_belet @endif">
-                                                                @if(isset($folder->total_price) & $folder->total_price !== '')
-                                                                    @php
-                                                                        $k=0
-                                                                    @endphp
-                                                                    <div class="row">
-                                                                        <div class="col-md-12 col-xs-12"  style="padding:0">
-                                                                            <h4 class="text-center folder_title" style="border-bottom: 1px solid slategray; color:#fff; background-color: {{ $folder->property->color }}; padding: 4px 0px;">
-                                                                                <b>{{$folder->title}}</b>
-                                                                            </h4>
-                                                                        </div>
+                                                    @if($folder->property->filter_value == 3)
+                                                        <div class="bukja-table @if($folder->on_tv != false) on_tv @endif
+                                                        @if($folder->on_radio != false) on_radio @endif
+                                                        @if($folder->on_subtitle != false) on_subtitle @endif
+                                                        @if($folder->on_web != false) on_web @endif
+                                                        @if($folder->on_belet != false) on_belet @endif">
+                                                            @if(isset($folder->total_price) & $folder->total_price !== '')
+                                                                @php
+                                                                    $k=0
+                                                                @endphp
+                                                                <div class="row">
+                                                                    <div class="col-md-12 col-xs-12"  style="padding:0">
+                                                                        <h4 class="text-center folder_title" style="border-bottom: 1px solid slategray; color:#fff; background-color: {{ $folder->property->color }}; padding: 4px 0px;">
+                                                                            <b>{{$folder->title}}</b>
+                                                                        </h4>
                                                                     </div>
-                                                                    <div class="row">
-                                                                        <div class="col-md-12 col-xs-12 for-border-box"  style="padding:0">
-                                                                            <div>
-                                                                                <p>{!! $folder->description !!}</p>
-                                                                            </div>
-                                                                            <table class="table table-striped">
-                                                                                <thead>
-                                                                                <tr>
-                                                                                    <th scope="col">Wagt aralygy</th>
-                                                                                    @if($folder->on_tv)
-                                                                                        <th scope="col">TV</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_radio)
-                                                                                        <th scope="col">Radio</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_subtitle)
-                                                                                        <th scope="col">Subtitle</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_web)
-                                                                                        <th scope="col">Web</th>
-                                                                                    @endif
-                                                                                    @if($folder->on_belet)
-                                                                                        <th scope="col">Belet</th>
-                                                                                    @endif
-                                                                                </tr>
-                                                                                </thead>
-                                                                                <tbody>
-                                                                                @isset($folder->folder_table)
-                                                                                    @foreach($folder->folder_table as $table)
-                                                                                        <tr>
-                                                                                            <td>@isset($table['time'])  {{$table['time']}} @endisset</td>
-                                                                                            @if($folder->on_tv)
-                                                                                                <td>@isset($table['set_tv'])  {{$table['set_tv']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_radio)
-                                                                                                <td>@isset($table['set_radio'])  {{$table['set_radio']}}@endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_subtitle)
-                                                                                                <td>@isset($table['set_sub'])  {{$table['set_sub']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_web)
-                                                                                                <td>@isset($table['set_web'])  {{$table['set_web']}} @endisset</td>
-                                                                                            @endif
-                                                                                            @if($folder->on_belet)
-                                                                                                <td>@isset($table['set_belet'])  {{$table['set_belet']}} @endisset</td>
-                                                                                            @endif
-                                                                                        </tr>
-                                                                                    @endforeach
-                                                                                @endisset
-                                                                                </tbody>
-                                                                            </table>
+                                                                </div>
+                                                                <div class="row">
+                                                                    <div class="col-md-12 col-xs-12 for-border-box"  style="padding:0">
+                                                                        <div>
+                                                                            <p>{!! $folder->description !!}</p>
                                                                         </div>
+                                                                        <table class="table table-striped">
+                                                                            <thead>
+                                                                            <tr>
+                                                                                <th scope="col">Wagt aralygy</th>
+                                                                                @if($folder->on_tv)
+                                                                                    <th scope="col">TV</th>
+                                                                                @endif
+                                                                                @if($folder->on_radio)
+                                                                                    <th scope="col">Radio</th>
+                                                                                @endif
+                                                                                @if($folder->on_subtitle)
+                                                                                    <th scope="col">Subtitle</th>
+                                                                                @endif
+                                                                                @if($folder->on_web)
+                                                                                    <th scope="col">Web</th>
+                                                                                @endif
+                                                                                @if($folder->on_belet)
+                                                                                    <th scope="col">Belet</th>
+                                                                                @endif
+                                                                            </tr>
+                                                                            </thead>
+                                                                            <tbody>
+                                                                            @isset($folder->folder_table)
+                                                                                @foreach($folder->folder_table as $table)
+                                                                                    <tr>
+                                                                                        <td>@isset($table['time'])  {{$table['time']}} @endisset</td>
+                                                                                        @if($folder->on_tv)
+                                                                                            <td>@isset($table['set_tv'])  {{$table['set_tv']}} @endisset</td>
+                                                                                        @endif
+                                                                                        @if($folder->on_radio)
+                                                                                            <td>@isset($table['set_radio'])  {{$table['set_radio']}}@endisset</td>
+                                                                                        @endif
+                                                                                        @if($folder->on_subtitle)
+                                                                                            <td>@isset($table['set_sub'])  {{$table['set_sub']}} @endisset</td>
+                                                                                        @endif
+                                                                                        @if($folder->on_web)
+                                                                                            <td>@isset($table['set_web'])  {{$table['set_web']}} @endisset</td>
+                                                                                        @endif
+                                                                                        @if($folder->on_belet)
+                                                                                            <td>@isset($table['set_belet'])  {{$table['set_belet']}} @endisset</td>
+                                                                                        @endif
+                                                                                    </tr>
+                                                                                @endforeach
+                                                                            @endisset
+                                                                            </tbody>
+                                                                        </table>
                                                                     </div>
-                                                                @endif
-                                                            </div>
-                                                        @endif
+                                                                </div>
+                                                            @endif
+                                                        </div>
                                                     @endif
                                                 @endforeach
                                             </div>