db_queries improved