The funny and great thing is I have some searches that were timing out in production and working in RP... then the same search still timing out in production even with this new upgrade...