Updates to feature aditor and search function.