JavaDoc update + query optimization