Pr/21

Black card query update.