1. Add auto uri search functionality
2. code modularize and clean up