Panel considers improved water-shortage bill