Added extra query mechanisms. Also rolled back to a stable version of Lire.