Fixed searchbox issues