PRD-1320 && PRD-1327 fixes

https://mirantis.jira.com/browse/PRD-1320
https://mirantis.jira.com/browse/PRD-1327

Tested in Safari browser too (Win/Mac environments).