Add --only-* flags to service command