Changed search by substring and date