javadoc fixes
don't optimize where clauses when we can't
javadoc