Implemented additional fields and dynamic result counter

3rd time's a charm.