Fix issue with multiple values returning from plugin query select