Fix & Update for Rest Feed Api