Improved the DB query !