HOTFIX: DDBNEXT-740 search for null causes 500