finish parsed response
fix filter
fix conflits