metadata fetching flow improvements

Fixes #90.
Please review @schilit