Updating code-- fixed search and views