Handle nulls correctly

If no values is given for a field we don't add a condition as even a
wildcard will fail to match NULL.
Merge branch 'develop-fftf'