ARP generator - optimise sql(s)
No reduntant sql queries are triggered
Merge pull request #60 from Edugate/develop

ARP generator - optimise sql(s)