Fixed bug where entity metadata was being requested unnecessarily.