Implement collections API filter and fallback system properly (bug 915803)

- Filters no longer automatically include NULL values
- Fallback no longer drops filters, instead replace the corresponding
  value with NULL
Merge pull request #1134 from diox/collections-fallback-null

Implement collections API filter and fallback system properly (bug 915803)