Fix Yoda conditionals and URL escaping