Fixed some bugs
Add support key value pairs selections