More Tweaking of Querying DB