Card #48 added annotation from query