Ajax search + small improvements