Fix query and add new icons