[#204]: Fix order in which key inputs are being processed and fix some issues with groups

[#204]: Fix order in which key inputs are being processed and fix some issues with groups #706