#422. Added check of affected price types, some enhancements of code.