antoniop
committed
on 14 Jun 18
Put redundant query definition into generic ones