Query optimization: Don't run clean on every save operation
Apply normalization factor when possible. Fix #19.