make query multitype, remove extra undeeded type