Added custom and allowed query additions