Search Feature added v.1.1