Cleaned up search code. Updated result templates