Fix for incorrect facets when viewing datasets within an organization (fix for (fix for bug#14)