Reverting to revision 0ff9ef503c65b45b184158cb4c06dec128fc7e49
Patched with fixes in the client list filter again after revert
Client filter list updated - working better now when Service is selected