add service disabled for prototype, search tweaked.