s/model/type/
remove queriac hacks, use new add syntax