Ajay/DC | #0000 | Bug fix - Handling DS with no location field