Added fix to make active data provider return without keys