Corrected API info & Checked TODO item: custom queries