added timeouts to filestore handler