Fixed links and included all query libraries