FIX: Only escape && and || and don't escape spaces