Did some cleanup on DB Select queries, added WHERE clauses.