Added heuristics (on 'name' columns) into RTMS query builder method.