Fix room search and elevator interaction