Well since it's annoying for both the waiter and the customer to have to ask/precise every time if it's bottled or tap, I just always say it directly, and I've seen other people do it

While abroad, I once asked many years ago for water in a restaurant and ended up with a 8$ 1L bottle, I'm not making that mistake again