v1.0.1 search also for nil values