Fixes in following functionality