Remove in service unit dispatch, added call search