Removed empty db info
Modified db query to go with new structure
Build 281