REPORTS-153 - updated preggo queries to be faster