improvement: added summary queries and conditions for a choice