Add working search
Fix Merge Issues