Improved search, added classes