fixed some issues in data layer