added author notes and fixed parameterization on DefaultQuery.