Suggested approach for #3, to only show the current directory

Hi there,

Please take a look at these changes, I've tried with various s3 buckets and it seems to be working well.

Thanks