Collapse Fixes
CR Fixes and Tab trigger for autocomplete