Search feature and Edit feature improvised