Fix master_node search