Added oData where support to builder, some minor fixes.