Fixed issues with displaying metadata