Make number of query fields flexible, show result count