diff --git a/archive-members.php b/archive-members.php
index 0cfd0c8..84e41d5 100644
--- a/archive-members.php
+++ b/archive-members.php
@@ -1,102 +1,102 @@
 <?php
 /*
 Template Name: Team Members
 Package: OnAir2
 Description: Members archive template and page
 Version: 0.0.0
 Author: QantumThemes
 Author URI: http://qantumthemes.com
 */
 
 /**
  * [$paged current paged number]
  * @var [int]
  */
 $paged = qantumthemes_get_paged();
 
 ?>
 <?php get_header(); ?> 
     <?php  
     get_template_part ('phpincludes/menu');
     get_template_part ('phpincludes/part-searchbar'); 
     ?>
     <div id="maincontent" class="qt-main">
         <?php 
         /**
          * From V 2.5
          */
         if (get_theme_mod( 'qt_playerbar_version', '1' ) === '2'){ ?>
             <hr class="qt-header-player-spacer">
         <?php } ?>
         <!-- ======================= HEADER SECTION ======================= -->
         <?php get_template_part( 'phpincludes/part-header-caption-archive'); ?>
         <?php 
         /**
          *
          *  This template can be used also as page template.
          *  In this case we show the page content only if is a page and is page 1
          * 
          */
         if(is_page()){
             if($paged == 1){
                 if ( have_posts() ) : while ( have_posts() ) : the_post();
                     the_content();                     
                 endwhile; endif;
             }
         }
         ?>
         <!-- ======================= CONTENT SECTION ======================= -->
         <div class="qt-container qt-vertical-padding-l qt-archive-team">
             <div class="row">
                 <?php 
-                    if(true || is_page()){
+                    if(is_page()){
                         /**
                          * [$args Query arguments]
                          * @var array
                          */
                         $args = array(
                             'post_type' => 'members',
                             'posts_per_page' => 30,
                             'post_status' => 'publish',
                             'orderby' => array ( 'menu_order' => 'ASC', 'date' => 'DESC'),
                             'suppress_filters' => false,
                             'paged' => $paged
                         );
 
                         /**
                          * [$wp_query execution of the query]
                          * @var WP_Query
                          */
                         $wp_query = new WP_Query( $args );
                         if ( $wp_query->have_posts() ) : while ( $wp_query->have_posts() ) : $wp_query->the_post();
                              ?>
                             <div id="post-<?php the_ID(); ?>" <?php post_class( "col s12 m4 l3" ); ?>">
                                 <?php get_template_part ( 'phpincludes/part-archive-item-members' ); ?>
                             </div>
                             <?php
                         endwhile; else: ?>
                             <h3><?php echo esc_attr__("Sorry, nothing here","onair2")?></h3>
                         <?php endif;
                         wp_reset_postdata();
                     } else {
                         if ( have_posts() ) : while ( have_posts() ) : the_post();
                             setup_postdata( $post );
                              ?>
                             <div id="post-<?php the_ID(); ?>" <?php post_class( "col s12 m4 l3" ); ?>>
                                 <?php get_template_part ( 'phpincludes/part-archive-item-members' ); ?>
                             </div>
                             <?php
                         endwhile; else: ?>
                             <h3><?php echo esc_attr__("Sorry, nothing here","onair2")?></h3>
                         <?php endif;
                     }
                 ?>
             </div>
         </div>
         <div class="qt-pagination qt-content-primary">
             <?php get_template_part ( 'phpincludes/part-pagination' ); ?>
         </div>
     </div><!-- .qt-main end -->
     <?php get_template_part ( 'phpincludes/footerwidgets' ); ?>
     <?php get_template_part (  'phpincludes/part-player-sidebar' ); ?>
 <?php get_footer(); ?>
diff --git a/functions.php b/functions.php
index d3ee0cc..dcd8f40 100755
--- a/functions.php
+++ b/functions.php
@@ -1,39 +1,50 @@
 <?php
 /**
  * OnAir2 Child theme
  * custom functions.php file
  */
 
 //wp_register_script('borderradio-custom', get_template_directory_uri() . '/script.js' );
 
 /**
  * Add parent and child stylesheets
  */
 add_action( 'wp_enqueue_scripts', 'qantumthemes_child_enqueue_styles' );
 if(!function_exists('qantumthemes_child_enqueue_styles')) {
 function qantumthemes_child_enqueue_styles() {
     wp_enqueue_style(  'parent-style', get_template_directory_uri() . '/style.css' );
     wp_enqueue_style(  'child-style', get_stylesheet_uri() );
 //    wp_enqueue_script( 'borderradio-custom' );
 }}
 
 /**
  * Upon activation flush the rewrite rules to avoid 404 on custom post types
  */
 add_action( 'after_switch_theme', 'qantumthemes_child_rewrite_flush_child' );
 if(!function_exists('qantumthemes_child_rewrite_flush_child')) {
 function qantumthemes_child_rewrite_flush_child() {
     flush_rewrite_rules();
 }}
 
 
 /**
  * Setup Onair2 Child Theme's textdomain.
  *
  * Declare textdomain for this child theme.
  * Translations can be filed in the /languages/ directory.
  */
 function qantumthemes_child_theme_setup() {
 	load_child_theme_textdomain( 'onair2-child',  get_stylesheet_directory() . '/languages' );
 }
 add_action( 'after_setup_theme', 'qantumthemes_child_theme_setup' );
+
+add_filter( 'pre_get_posts', function( $query ) {
+	/**
+	 * Display all the Speakers in one single page
+	 *
+	 * See https://gitpull.it/T162
+	 */
+	if ( is_tax( 'membertype' ) ) {
+		$query->set( 'nopaging', true );
+	}
+} );