query toolbar more changes