Added search & sorting