Add room search support