Does anybody have any tip/trick or something to avoid searches timing out very easily with this new Database Upgrade?