antoniop
committed
on 28 Nov 18
Replace queries with api and already available information