Multiple metadata selection fixes