Fixed issue with sending 2 db calls using Futures

This should now send only one call to improve performance.