webapp and metadata tweaked