Added Search, History & Bucket features...