Hotfix, changed priorities' criteria
Hotfix, solved minor bugs so it works on production environment