added cardinality widget
coding style adaptions
visual, fixed queries