Fixed filtered selection process
Merge branch 'qa'