Could you please make setting, to be checked do you want waveforms or no. This is life saver. Like 2500 songs in folder, would be scanned for days. And i have to restart the scans again and again (even that i set max_execution_time to 500 secs). Right now this 2500 songs were scanned with 3 rescans. I made fast fix while keeping return  in the beginning of the whole file.