Various fixes.

Did some changes to not re-access the DB when not needed. See:
https://github.com/sy4mil/Options-Framework/issues/257