A bit messy but search is working now
A bit messy but search is working now