[Service/Client Filters] Simplify filters logic, no need in being so strict about entity type