Added search functionality and basic sorting (WIP)