Boolean fix merge

Fix quoted booleans