Popular Labels and Labels List macros include labels for pages in space trash

Issue Summary

Both the Popular Labels and Labels List macros will include results for deleted pages. This means that labels on deleted pages will show in this macro, even if the label isn't on any active pages.

Steps to Reproduce

1. Create a new space (starting in a clean space makes it easier to populate the "Popular macros" table
2. On a new page, insert a Popular Labels and a Labels Page macro.
3. In the settings of both macros, restrict the results to the current space key.
4. Save the page.
5. Create another new page, then give it a label.
6. Delete the new labelled page

Expected Results

The macros will not show labels that are only on deleted pages.

Actual Results

The macros still show labels that are on the deleted page.

Workaround

In order to remove the labels, you can purge the pages from the space trash.