Battery and mode query fix