improved query statements

Some query improvements ;-) This reduces ~ the DB Hits by /10