Fixed the filter when nopref is chosen
Merge branch 'master' into filter