Change executeQuery to depend on executeUnfilteredQuery.