-updated search functionality
-remove autot