fixxed queries again...