Have been reverted to count($facets) etc. in the development branch, so it will be part of next PR.