Modify criteria frontend finished