updates to cli to better support adding multiple filters of a given type, and services with optional versions etc