Hawaii bottle bill to include supplements