APIv2 work. fixed find_top call, cleaned some methods