Improved fee selection