Fixed UI refresh issue, ordering of candidates preserved for quota.
Cleanup code.