Handle no s key in streammap
Update file location