Fixed crashing issues, search, analytics