Fixes bug 913126 - Made rapid betas work in all search-based systems.
addressed comments by Brandon and Selena, more code comments, better names.