Updated to work with continuous search results option