with updated search modifications