Fixed some issue on getting certain fields only