Added makeConstructQuery as depracated but still visible because needed by frontend