Nburka fix search queue logic

Small cleanups.