refactor querying and filtering into ActorService