Editing issue resolved plus new search filter introduced