Minor change to annotation categorization for pretty printing
Added query mode for computing default effects. Temporarily disabling simplification until synced with Shyam