Code fixes: now filter is more simple