Fixed infinite loop in search and extra commas

Why am I pushing bug fixes at this hour?