Ashwin/Melanie | #3007 | Fixing single and multiselect