documentation, query join tweaks