I'm assuming meant to filter on `_current_version__isnull=False` if `theme=True` here? It would probably be easier to do `Q(type=amo.ADDON_PERSONA) | Q(_current_version__isnull=False)`