basic searching working for both structures :triumph: