Re-added redirect to user for single match
Removed unused code