Merge pull request 'SQL optimisations' (#227) from i-hate-sql into develop