Updated to use collection definition at start

Collection context should not be, of neccessity, part of the query
string itself. Moved that to the class instantiation.
Fixed a bug in one of the ResultSet Classes