Refactorings of capabilities response filter