Minor query changes, note to self, DO NOT append DB name to queries.