fix sorting of resolved requests
refactor