Need to handle reverse match key via match key details

[barrycaceres]

Currently the code that reverse the match key is based solely on the match key, but it should build the reverse match key from the match key details.