Added ability to search & sort items