improved MonetDB DS SQL -> filter mapping