Increase default wait_until timeout. Update tap logic to include enabled? check.