Return null to avoid cache search query (#281)

Return null to avoid cache search query (#281) #240