ORG-1075: improve worflow in frontend, fix backend to avoid iphone style issue