Thanks for merging. The ideas are not exactly the same. One is filtering and one is adding UI fields.