Add support for key => value style 2 column queries