Updated search and library formatting