More efficient query methods, extended the docs a bit