added search and format