Reworked database definitions to get just ONE query
Merge pull request #2 from SiebelsTim/master

Reworked database definitions to get just ONE query