Search feature is now implemented

Need more tests