Added search form; currency support