#37 not including filtering queries in amount()