Extended query mix implemented, fixes