so minor changes - 9 querys already

one or two more would be nice