restored original search and city boxes