Better sale price detection Closes #3316 from 2.1