Fix volume automatic selection and remove code duplication