Refactored service-list filters

Except fixing bug also added more filter options,
that are expected to be added for client.

Change-Id: Ie25d77b8b46914879e0a18189c3cd9c2fa71f860
Closes-Bug: #1309024