fix class name for db_where
Deeper DB review
Update valid class