Finished updating app with working search/filter.