Fix issues Issues CRAFTERCMS-472 partialy CRAFTERCMS-490

Fix issues Issues CRAFTERCMS-472 partialy CRAFTERCMS-490