add sample data for search
broken :(
fix Wilson's conflicts