Fix for #33 and other fluent query quirks