More work on BZ#1019013 to update the validation to include custom entities.