Formatting
Added filter to disable schema. Closes #1359