updated search functionality and other things