Database, Feed

Switched over use to Query object for generating queries, fixing Feed
Class.