Commit No. 37 - Search filter optimized