Adding fix for single result searches