Adding searching by service