fix in case of deprecated queries