Upgrade searches, add advanced ranges