Took care of + in search and filename