API: Fix behavior of filtering by service