Adding translations and fix bugs with add new criteria