Compatible with 0.11: query defaults to null now