more filter fixes.  support for filter by machine_name