Merge "Add chips to support mime type query"